aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/orion
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2013-06-04 11:19:41 +0000
committerImre Kaloz <kaloz@openwrt.org>2013-06-04 11:19:41 +0000
commit8133b575402ad6c7e2a79c4582d23c88365419fd (patch)
treeb420162547b15eb7a516aabcd20929207e7b29ff /target/linux/orion
parent662e136d4079e13c9e1c083e5d8ebc9c039dc72f (diff)
downloadupstream-8133b575402ad6c7e2a79c4582d23c88365419fd.tar.gz
upstream-8133b575402ad6c7e2a79c4582d23c88365419fd.tar.bz2
upstream-8133b575402ad6c7e2a79c4582d23c88365419fd.zip
[orion]: move DT2 related kernel options into the harddist subtarget
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36833 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/orion')
-rw-r--r--target/linux/orion/config-3.38
-rw-r--r--target/linux/orion/harddisk/config-3.34
2 files changed, 8 insertions, 4 deletions
diff --git a/target/linux/orion/config-3.3 b/target/linux/orion/config-3.3
index c85740a8e2..9418e0004f 100644
--- a/target/linux/orion/config-3.3
+++ b/target/linux/orion/config-3.3
@@ -84,8 +84,8 @@ CONFIG_HAVE_PROC_CPU=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_SCHED_CLOCK=y
CONFIG_HAVE_SPARSE_IRQ=y
-CONFIG_HWMON=y
-CONFIG_I2C_BOARDINFO=y
+# CONFIG_HWMON is not set
+# CONFIG_I2C_BOARDINFO is not set
CONFIG_INET_LRO=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_KTIME_SCALAR=y
@@ -94,7 +94,7 @@ CONFIG_LEDS_GPIO=y
# CONFIG_MACH_D2NET is not set
# CONFIG_MACH_DB88F5281 is not set
# CONFIG_MACH_DNS323 is not set
-CONFIG_MACH_DT2=y
+# CONFIG_MACH_DT2 is not set
# CONFIG_MACH_EDMINI_V2 is not set
# CONFIG_MACH_KUROBOX_PRO is not set
# CONFIG_MACH_LINKSTATION_LSCHL is not set
@@ -135,7 +135,7 @@ CONFIG_PERF_USE_VMALLOC=y
CONFIG_PHYLIB=y
CONFIG_PLAT_ORION=y
# CONFIG_PREEMPT_RCU is not set
-CONFIG_RTC_CLASS=y
+# CONFIG_RTC_CLASS is not set
# CONFIG_SCSI_DMA is not set
CONFIG_SPLIT_PTLOCK_CPUS=999999
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/target/linux/orion/harddisk/config-3.3 b/target/linux/orion/harddisk/config-3.3
index a566aa537e..73bf55c11a 100644
--- a/target/linux/orion/harddisk/config-3.3
+++ b/target/linux/orion/harddisk/config-3.3
@@ -8,7 +8,10 @@ CONFIG_CRC16=y
# CONFIG_DM_SNAPSHOT is not set
CONFIG_EXT4_FS=y
CONFIG_FS_MBCACHE=y
+CONFIG_HWMON=y
+CONFIG_I2C_BOARDINFO=y
CONFIG_JBD2=y
+CONFIG_MACH_DT2=y
CONFIG_MD=y
CONFIG_MD_AUTODETECT=y
CONFIG_MD_LINEAR=y
@@ -18,6 +21,7 @@ CONFIG_MD_RAID1=y
# CONFIG_MD_RAID10 is not set
# CONFIG_MD_RAID456 is not set
CONFIG_NLS=y
+CONFIG_RTC_CLASS=y
CONFIG_SATA_MV=y
CONFIG_SCSI=y
CONFIG_SCSI_MOD=y