diff options
| author | John Crispin <john@openwrt.org> | 2011-07-04 07:50:34 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2011-07-04 07:50:34 +0000 |
| commit | 04fefa4a2860d33c16434859a7a2b182eb8406e5 (patch) | |
| tree | bf515176ced8fe9bce15e751a6def2cc2da79810 /target/linux/lantiq | |
| parent | e9c8218375434edffc1d00ec2e824207c35b8851 (diff) | |
| download | upstream-04fefa4a2860d33c16434859a7a2b182eb8406e5.tar.gz upstream-04fefa4a2860d33c16434859a7a2b182eb8406e5.tar.bz2 upstream-04fefa4a2860d33c16434859a7a2b182eb8406e5.zip | |
fix broken falcon patches from last night
SVN-Revision: 27441
Diffstat (limited to 'target/linux/lantiq')
| -rw-r--r-- | target/linux/lantiq/falcon-stable/config-default | 33 | ||||
| -rw-r--r-- | target/linux/lantiq/falcon/config-2.6.32 | 32 | ||||
| -rw-r--r-- | target/linux/lantiq/patches-2.6.39/110-falcon_board.patch | 2 |
3 files changed, 33 insertions, 34 deletions
diff --git a/target/linux/lantiq/falcon-stable/config-default b/target/linux/lantiq/falcon-stable/config-default index 1b7582f898..5154ddb330 100644 --- a/target/linux/lantiq/falcon-stable/config-default +++ b/target/linux/lantiq/falcon-stable/config-default @@ -1 +1,32 @@ -../falcon/config-2.6.32
\ No newline at end of file +CONFIG_CPU_MIPSR2_IRQ_EI=y +CONFIG_CPU_MIPSR2_IRQ_VI=y +CONFIG_DM9000=y +CONFIG_DM9000_DEBUGLEVEL=4 +CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +# CONFIG_I2C_DESIGNWARE is not set +CONFIG_I2C_FALCON=y +CONFIG_IFX_VPE_CACHE_SPLIT=y +CONFIG_IFX_VPE_EXT=y +CONFIG_LANTIQ_MACH_95C3AM1=y +CONFIG_LANTIQ_MACH_EASY98000=y +CONFIG_LANTIQ_MACH_EASY98020=y +CONFIG_M25PXX_USE_FAST_READ=y +CONFIG_MIPS_MT=y +# CONFIG_MIPS_VPE_APSP_API is not set +CONFIG_MIPS_VPE_LOADER=y +CONFIG_MIPS_VPE_LOADER_TOM=y +CONFIG_MTD_M25P80=y +CONFIG_MTSCHED=y +# CONFIG_PERFCTRS is not set +# CONFIG_SOC_AMAZON_SE is not set +CONFIG_SOC_FALCON=y +# CONFIG_SOC_TYPE_XWAY is not set +# CONFIG_SOC_XWAY is not set +CONFIG_SPI=y +# CONFIG_SPI_BITBANG is not set +CONFIG_SPI_FALCON=y +# CONFIG_SPI_GPIO is not set +CONFIG_SPI_MASTER=y +# CONFIG_SPI_SPIDEV is not set diff --git a/target/linux/lantiq/falcon/config-2.6.32 b/target/linux/lantiq/falcon/config-2.6.32 deleted file mode 100644 index 5154ddb330..0000000000 --- a/target/linux/lantiq/falcon/config-2.6.32 +++ /dev/null @@ -1,32 +0,0 @@ -CONFIG_CPU_MIPSR2_IRQ_EI=y -CONFIG_CPU_MIPSR2_IRQ_VI=y -CONFIG_DM9000=y -CONFIG_DM9000_DEBUGLEVEL=4 -CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y -CONFIG_I2C=y -CONFIG_I2C_BOARDINFO=y -# CONFIG_I2C_DESIGNWARE is not set -CONFIG_I2C_FALCON=y -CONFIG_IFX_VPE_CACHE_SPLIT=y -CONFIG_IFX_VPE_EXT=y -CONFIG_LANTIQ_MACH_95C3AM1=y -CONFIG_LANTIQ_MACH_EASY98000=y -CONFIG_LANTIQ_MACH_EASY98020=y -CONFIG_M25PXX_USE_FAST_READ=y -CONFIG_MIPS_MT=y -# CONFIG_MIPS_VPE_APSP_API is not set -CONFIG_MIPS_VPE_LOADER=y -CONFIG_MIPS_VPE_LOADER_TOM=y -CONFIG_MTD_M25P80=y -CONFIG_MTSCHED=y -# CONFIG_PERFCTRS is not set -# CONFIG_SOC_AMAZON_SE is not set -CONFIG_SOC_FALCON=y -# CONFIG_SOC_TYPE_XWAY is not set -# CONFIG_SOC_XWAY is not set -CONFIG_SPI=y -# CONFIG_SPI_BITBANG is not set -CONFIG_SPI_FALCON=y -# CONFIG_SPI_GPIO is not set -CONFIG_SPI_MASTER=y -# CONFIG_SPI_SPIDEV is not set diff --git a/target/linux/lantiq/patches-2.6.39/110-falcon_board.patch b/target/linux/lantiq/patches-2.6.39/110-falcon_board.patch index 58f1479d7a..072a5ab80c 100644 --- a/target/linux/lantiq/patches-2.6.39/110-falcon_board.patch +++ b/target/linux/lantiq/patches-2.6.39/110-falcon_board.patch @@ -1815,7 +1815,7 @@ +cflags-$(CONFIG_SOC_FALCON) += -I$(srctree)/arch/mips/include/asm/mach-lantiq/falcon --- a/arch/mips/lantiq/machtypes.h +++ b/arch/mips/lantiq/machtypes.h -@@ -15,6 +15,11 @@ enum lantiq_mach_type { +@@ -15,6 +15,12 @@ enum lantiq_mach_type { LTQ_MACH_GENERIC = 0, LTQ_MACH_EASY50712, /* Danube evaluation board */ LTQ_MACH_EASY50601, /* Amazon SE evaluation board */ |