summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2007-07-11 15:21:17 +0000
committerGabor Juhos <juhosg@openwrt.org>2007-07-11 15:21:17 +0000
commita31921a8cdbfe2d16ebf6ad81c7b98194648dba0 (patch)
tree3230294fc8b307c0c9fbeb3386fa7d5dc12cccc8
parent5ca2391456c08cae128e89d9e02cbbd1953c22fb (diff)
downloadmaster-31e0f0ae-a31921a8cdbfe2d16ebf6ad81c7b98194648dba0.tar.gz
master-31e0f0ae-a31921a8cdbfe2d16ebf6ad81c7b98194648dba0.tar.bz2
master-31e0f0ae-a31921a8cdbfe2d16ebf6ad81c7b98194648dba0.zip
remove hardware accelerated byte swapping feature, and resync kernel config
SVN-Revision: 7924
-rw-r--r--target/linux/adm5120-2.6/config/default1
-rw-r--r--target/linux/adm5120-2.6/files/arch/mips/adm5120/Kconfig4
-rw-r--r--target/linux/adm5120eb-2.6/config/default3
3 files changed, 2 insertions, 6 deletions
diff --git a/target/linux/adm5120-2.6/config/default b/target/linux/adm5120-2.6/config/default
index 70d218d23f..eb30a16254 100644
--- a/target/linux/adm5120-2.6/config/default
+++ b/target/linux/adm5120-2.6/config/default
@@ -1,7 +1,6 @@
CONFIG_32BIT=y
# CONFIG_64BIT is not set
# CONFIG_64BIT_PHYS_ADDR is not set
-# CONFIG_ADM5120_HARDWARE_SWAB is not set
CONFIG_ADM5120_NR_UARTS=2
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/Kconfig b/target/linux/adm5120-2.6/files/arch/mips/adm5120/Kconfig
index 1b73a370b4..584b2daef0 100644
--- a/target/linux/adm5120-2.6/files/arch/mips/adm5120/Kconfig
+++ b/target/linux/adm5120-2.6/files/arch/mips/adm5120/Kconfig
@@ -7,10 +7,6 @@ config PCI_ADM5120
select PCI
default y
-config ADM5120_HARDWARE_SWAB
- bool "Enable hardware accelerated byte-swapping"
- default y
-
endmenu
endif
diff --git a/target/linux/adm5120eb-2.6/config/default b/target/linux/adm5120eb-2.6/config/default
index c9ef9b1c2c..e1761f1c92 100644
--- a/target/linux/adm5120eb-2.6/config/default
+++ b/target/linux/adm5120eb-2.6/config/default
@@ -1,7 +1,6 @@
CONFIG_32BIT=y
# CONFIG_64BIT is not set
# CONFIG_64BIT_PHYS_ADDR is not set
-# CONFIG_ADM5120_HARDWARE_SWAB is not set
CONFIG_ADM5120_NR_UARTS=2
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -52,6 +51,7 @@ CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
+CONFIG_EARLY_PRINTK=y
CONFIG_ELF_CORE=y
# CONFIG_EXT3_FS_POSIX_ACL is not set
# CONFIG_EXT3_FS_SECURITY is not set
@@ -224,6 +224,7 @@ CONFIG_SOFT_WATCHDOG=m
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
+CONFIG_SYS_HAS_EARLY_PRINTK=y
CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y