diff options
Diffstat (limited to 'target/config')
-rw-r--r-- | target/config/Config.in.arm.choice | 40 | ||||
-rw-r--r-- | target/config/Config.in.kernel | 3 | ||||
-rw-r--r-- | target/config/Config.in.kernelversion.choice | 9 | ||||
-rw-r--r-- | target/config/Config.in.runtime | 11 | ||||
-rw-r--r-- | target/config/Config.in.target | 4 |
5 files changed, 50 insertions, 17 deletions
diff --git a/target/config/Config.in.arm.choice b/target/config/Config.in.arm.choice index 6011fd7a1..79e70078b 100644 --- a/target/config/Config.in.arm.choice +++ b/target/config/Config.in.arm.choice @@ -21,20 +21,54 @@ config ADK_CPU_ARMV7A endchoice choice -prompt "Cubox-i model" -depends on ADK_TARGET_SYSTEM_CUBOX_I +prompt "Solidrun IMX6 model" +depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 config ADK_TARGET_CUBOX_I4PRO boolean "Solidrun Cubox-i4Pro" + select ADK_TARGET_WITH_SMP + select ADK_TARGET_WITH_WIFI + select ADK_TARGET_WITH_RTC + select ADK_TARGET_WITH_SDIO + select ADK_TARGET_WITH_SATA config ADK_TARGET_CUBOX_I2ULTRA boolean "Solidrun Cubox-i2Ultra" + select ADK_TARGET_WITH_SMP + select ADK_TARGET_WITH_WIFI + select ADK_TARGET_WITH_RTC + select ADK_TARGET_WITH_SDIO + select ADK_TARGET_WITH_SATA + +config ADK_TARGET_CUBOX_I2EX + boolean "Solidrun Cubox-i2eX" + select ADK_TARGET_WITH_SMP + select ADK_TARGET_WITH_WIFI + select ADK_TARGET_WITH_RTC + select ADK_TARGET_WITH_SDIO + select ADK_TARGET_WITH_SATA config ADK_TARGET_CUBOX_I2 boolean "Solidrun Cubox-i2" + select ADK_TARGET_WITH_SMP + select ADK_TARGET_WITH_WIFI + select ADK_TARGET_WITH_RTC + select ADK_TARGET_WITH_SDIO config ADK_TARGET_CUBOX_I1 boolean "Solidrun Cubox-i1" + select ADK_TARGET_WITH_WIFI + select ADK_TARGET_WITH_SDIO -endchoice +config ADK_TARGET_HUMMINGBOARD_I1 + boolean "Solidrun Hummingboard-i1" + +config ADK_TARGET_HUMMINGBOARD_I2 + boolean "Solidrun Hummingboard-i2" + select ADK_TARGET_WITH_SMP +config ADK_TARGET_HUMMINGBOARD_I2EX + boolean "Solidrun Hummingboard-i2eX" + select ADK_TARGET_WITH_SMP + +endchoice diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel index bf293019b..add212587 100644 --- a/target/config/Config.in.kernel +++ b/target/config/Config.in.kernel @@ -56,8 +56,7 @@ config ADK_TARGET_KERNEL_MINICONFIG default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K default "vbox-x86" if ADK_TARGET_SYSTEM_VBOX_X86 default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40 - default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I - default "hummingboard" if ADK_TARGET_SYSTEM_HUMMINGBOARD + default "solidrun-imx6" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG diff --git a/target/config/Config.in.kernelversion.choice b/target/config/Config.in.kernelversion.choice index f6bcf0a22..335962b64 100644 --- a/target/config/Config.in.kernelversion.choice +++ b/target/config/Config.in.kernelversion.choice @@ -4,6 +4,7 @@ choice prompt "Kernel Version" depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM && ADK_TARGET_KERNEL_CUSTOMISING +default ADK_KERNEL_VERSION_3_14_15 if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default ADK_KERNEL_VERSION_3_16_1 config ADK_KERNEL_VERSION_3_16_1 @@ -15,25 +16,25 @@ config ADK_KERNEL_VERSION_3_16_1 config ADK_KERNEL_VERSION_3_15_8 prompt "3.15.8" depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX + depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 boolean select ADK_KERNEL_VERSION_3_15 config ADK_KERNEL_VERSION_3_14_15 prompt "3.14.15" - depends on !ADK_TARGET_SYSTEM_CUBOX_I boolean select ADK_KERNEL_VERSION_3_14 config ADK_KERNEL_VERSION_3_12_26 prompt "3.12.26" - depends on !ADK_TARGET_SYSTEM_CUBOX_I + depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX boolean select ADK_KERNEL_VERSION_3_12 config ADK_KERNEL_VERSION_3_10_51 prompt "3.10.51" - depends on !ADK_TARGET_SYSTEM_CUBOX_I + depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX boolean select ADK_KERNEL_VERSION_3_10 @@ -41,7 +42,7 @@ config ADK_KERNEL_VERSION_3_10_51 config ADK_KERNEL_VERSION_3_4_101 prompt "3.4.101" depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI - depends on !ADK_TARGET_SYSTEM_CUBOX_I + depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX boolean select ADK_KERNEL_VERSION_3_4 diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 7f48513a2..845786a45 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -36,7 +36,7 @@ config ADK_RUNTIME_TMPFS_SIZE default "16384" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default "32768" if ADK_TARGET_SYSTEM_IBM_X40 default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI - default "32768" if ADK_TARGET_SYSTEM_CUBOX_I + default "32768" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default "8192" if ADK_TARGET_SYSTEM_MIKROTIK_RB532 default "2048" help @@ -102,7 +102,7 @@ config ADK_RUNTIME_GETTY_VGA default y if ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY default y if ADK_TARGET_QEMU_WITH_GRAPHIC default y if ADK_TARGET_SYSTEM_RASPBERRY_PI - default y if ADK_TARGET_SYSTEM_CUBOX_I + default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_ARANYM_M68K @@ -117,6 +117,7 @@ config ADK_RUNTIME_GETTY_SERIAL default n if ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY default n if ADK_TARGET_QEMU_WITH_GRAPHIC default n if ADK_TARGET_SYSTEM_RASPBERRY_PI + default n if ADK_TARGET_SYSTEM_HUMMINGBOARD default n if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n if ADK_TARGET_SYSTEM_IBM_X40 default n if ADK_TARGET_SYSTEM_ARANYM_M68K @@ -131,7 +132,7 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE default "ttyUL0" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 default "ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB || ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 || ADK_TARGET_SYSTEM_ARM_FM || ADK_TARGET_SYSTEM_QEMU_AARCH64 default "ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH - default "ttymxc0" if ADK_TARGET_SYSTEM_CUBOX_I + default "ttymxc0" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default "ttyS0" config ADK_RUNTIME_CONSOLE_SERIAL_SPEED @@ -289,9 +290,7 @@ endmenu menu "wlan0 Configuration" depends on ADK_SIMPLE_NETWORK_CONFIG -depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG || \ - ADK_TARGET_SYSTEM_CUBOX_I || \ - ADK_TARGET_SYSTEM_IBM_X40 +depends on ADK_TARGET_WITH_WIFI choice prompt "Type" diff --git a/target/config/Config.in.target b/target/config/Config.in.target index 3abb99b9e..6cb858450 100644 --- a/target/config/Config.in.target +++ b/target/config/Config.in.target @@ -43,8 +43,8 @@ config ADK_TARGET_CMDLINE default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_APU - default "console=ttymxc0,115200 console=tty0" if ADK_TARGET_SYSTEM_CUBOX_I && ADK_RUNTIME_VERBOSE_INIT_VGA - default "console=tty0 console=ttymxc0,115200" if ADK_TARGET_SYSTEM_CUBOX_I && ADK_RUNTIME_VERBOSE_INIT_SERIAL + default "console=ttymxc0,115200 console=tty0" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 && ADK_RUNTIME_VERBOSE_INIT_VGA + default "console=tty0 console=ttymxc0,115200" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 && ADK_RUNTIME_VERBOSE_INIT_SERIAL default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 && ADK_RUNTIME_VERBOSE_INIT_VGA default "console=tty0 console=ttyS0,115200" if ADK_TARGET_SYSTEM_IBM_X40 && ADK_RUNTIME_VERBOSE_INIT_SERIAL default "console=tty0" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG |