diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-10 11:53:14 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-10 11:53:14 +0200 |
| commit | 6284d31d422bd34a95d1f9797a9b3a5f791a6cfd (patch) | |
| tree | 81abf75125083a8b7e454bcc571e72d4e40f181e /target/config | |
| parent | 86f7be71c19f941d6f810010f18fb76c478f5aef (diff) | |
| parent | 82949d243f9451a8495609995a8a71a2a153ac08 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/config')
| -rw-r--r-- | target/config/Config.in | 17 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 1 |
2 files changed, 17 insertions, 1 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index 796b55684..3ba120320 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -526,6 +526,7 @@ config ADK_TARGET_CFLAGS config ADK_TARGET_CMDLINE string + default "rootfstype=ext4 root=/dev/mmcblk0p2 rootwait" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "console=tty no_auto_cmd" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100 default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP @@ -575,6 +576,7 @@ config ADK_TARGET_LIB_UCLIBC depends on \ !ADK_LINUX_SPARC64 && \ !ADK_LINUX_PPC64 && \ + !ADK_TARGET_SYSTEM_RASPBERRY_PI && \ !ADK_LINUX_NATIVE help http://uclibc.org @@ -616,6 +618,7 @@ config ADK_TARGET_LIB_GLIBC ADK_LINUX_SPARC64 || \ ADK_LINUX_X86 || \ ADK_LINUX_X86_64 + depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI help http://www.gnu.org/libc @@ -653,6 +656,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS ADK_LINUX_X86_64 || \ ADK_LINUX_NATIVE depends on !ADK_HARDWARE_VBOX + depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_KERNEL_BLK_DEV_INITRD select ADK_KERNEL_RD_XZ help @@ -671,6 +675,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK ADK_LINUX_X86_64 || \ ADK_LINUX_NATIVE depends on !ADK_HARDWARE_VBOX + depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_KERNEL_EXT2_FS help create an read-only initramfs system. @@ -703,6 +708,7 @@ config ADK_TARGET_ROOTFS_NFSROOT select ADK_KERNEL_IP_PNP select ADK_KERNEL_IP_PNP_DHCP depends on !ADK_HARDWARE_QEMU && !ADK_HARDWARE_VBOX + depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI help Root filesystem mounted via NFS. (DHCP) @@ -744,6 +750,7 @@ config ADK_TARGET_ROOTFS_MMC depends on ADK_TARGET_WITH_MMC select ADK_KERNEL_EXT2_FS select ADK_KERNEL_SCSI + depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI help Use this option if you have a MMC/SDCARD based system. (ext2 filesystem is used.) @@ -755,9 +762,17 @@ config ADK_TARGET_ROOTFS_ARCHIVE endchoice +config ADK_TARGET_ROOT_EXT4_RASPBERRY_PI + boolean + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI && ADK_TARGET_ROOTFS_ARCHIVE + select ADK_KERNEL_EXT4_FS + default y + help + Compile EXT4 filesystem into kernel and use it as root filesystem. + choice prompt "Root filesystem type" -depends on ADK_TARGET_ROOTFS_ARCHIVE +depends on ADK_TARGET_ROOTFS_ARCHIVE && !ADK_TARGET_SYSTEM_RASPBERRY_PI default ADK_TARGET_ROOT_EXT2_FS config ADK_TARGET_ROOT_EXT2 diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 2c1ccb1d1..f6fd11a26 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -36,6 +36,7 @@ config ADK_RUNTIME_TIMEZONE choice prompt "Console output on embedded system" default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA +default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI default ADK_RUNTIME_CONSOLE_SERIAL config ADK_RUNTIME_CONSOLE_VGA |