diff options
| -rw-r--r-- | Config.in | 6 | ||||
| -rw-r--r-- | mk/rootfs.mk | 26 | ||||
| -rw-r--r-- | target/config/Config.in.kernelcmd (renamed from target/config/Config.in.target) | 2 | ||||
| -rw-r--r-- | target/config/Config.in.rootfs | 39 |
4 files changed, 17 insertions, 56 deletions
@@ -28,7 +28,6 @@ source "target/config/Config.in.qemuopts" source "target/config/Config.in.cpu" source "target/config/Config.in.tasks" source "target/config/Config.in.rootfs" -source "target/config/Config.in.target" source "target/config/Config.in" menu "Package selection" @@ -45,14 +44,17 @@ menu "Runtime configuration" source "target/config/Config.in.runtime" endmenu +menu "Linux Kernel configuration" source "target/config/Config.in.kernelversion" source "target/config/Config.in.kernelcfg" +source "target/config/Config.in.kernelcmd" source "target/linux/config/Config.in.compression" -menu "Kernel configuration" +menu "Advanced Kernel configuration" visible if ADK_TARGET_OS_LINUX && ADK_TARGET_KERNEL_CUSTOMISING && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH && !ADK_TARGET_KERNEL_USE_DEFCONFIG && !ADK_TARGET_KERNEL_USE_CUSTOMCONFIG source "target/linux/Config.in" endmenu +endmenu menu "Toolchain settings" visible if !ADK_TARGET_CHOOSE_ARCH diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 4209d2cfa..360e41083 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -12,18 +12,18 @@ ifeq ($(ADK_TARGET_QEMU),y) MTDDEV:= root=/dev/mtdblock0 ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y) ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) -ROOTFS:= root=/dev/vda1 +BLOCKDEV:= root=/dev/vda1 else -ROOTFS:= root=/dev/sda1 rootwait +BLOCKDEV:= root=/dev/sda1 endif endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y) -ROOTFS:= root=/dev/mmcblk0p1 +BLOCKDEV:= root=/dev/mmcblk0p1 endif endif ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y) -ROOTFS:= root=/dev/sda2 +BLOCKDEV:= root=/dev/sda2 MTDDEV:= root=/dev/mtdblock1 endif @@ -32,34 +32,32 @@ MTDDEV:= root=/dev/mtdblock7 endif ifeq ($(ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20),y) -ROOTFS:= root=/dev/mmcblk0p2 rootwait +BLOCKDEV:= root=/dev/mmcblk0p2 endif ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y) -ROOTFS:= root=/dev/sda1 rootwait +BLOCKDEV:= root=/dev/sda1 endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) -ROOTFS:= root=/dev/mmcblk0p2 rootwait +BLOCKDEV:= root=/dev/mmcblk0p2 endif ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) -ROOTFS:= root=/dev/mmcblk0p1 rootwait +BLOCKDEV:= root=/dev/mmcblk0p1 endif ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) -USB:= rootwait root=/dev/sdb1 -else -USB:= rootdelay=2 +USBDEV:= root=/dev/sdb1 endif -$(eval $(call rootfs_template,usb,USB,$(USB))) -$(eval $(call rootfs_template,archive,ARCHIVE,$(ROOTFS))) +$(eval $(call rootfs_template,usb,USB,$(USBDEV) rootwait)) +$(eval $(call rootfs_template,archive,ARCHIVE,$(BLOCKDEV) rootwait)) $(eval $(call rootfs_template,initramfs,INITRAMFS,rootfstype=tmpfs)) $(eval $(call rootfs_template,initramfspiggyback,INITRAMFSPIGGYBACK,rootfstype=tmpfs)) $(eval $(call rootfs_template,initramfsarchive,INITRAMFSARCHIVE,rootfstype=tmpfs)) $(eval $(call rootfs_template,squashfs,SQUASHFS,$(MTDDEV) rootfstype=squashfs)) -$(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3)) +$(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV))) $(eval $(call rootfs_template,jffs2,JFFS2,$(MTDDEV) rootfstype=jffs2)) $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp)) $(eval $(call rootfs_template,encrypted,ENCRYPTED)) diff --git a/target/config/Config.in.target b/target/config/Config.in.kernelcmd index 5fef2270e..d630eb86c 100644 --- a/target/config/Config.in.target +++ b/target/config/Config.in.kernelcmd @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. config ADK_TARGET_CMDLINE - string + string "Kernel cmdline" default "fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS default "geodewdt.nowayout=1" if ADK_TARGET_MODEL_PCENGINES_ALIX1C default "kinetis_platform=k70-som" if ADK_TARGET_SYSTEM_KINETIS_K70 diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs index f4a974bcb..28d8f2254 100644 --- a/target/config/Config.in.rootfs +++ b/target/config/Config.in.rootfs @@ -164,42 +164,3 @@ config ADK_TARGET_ROOTFS_GENIMAGE Create a complete disk image for the target with genimage. endchoice - -choice -prompt "Root filesystem" -depends on ADK_TARGET_ROOTFS_ARCHIVE || ADK_TARGET_ROOTFS_USB && !ADK_TARGET_QEMU -default ADK_TARGET_ROOT_EXT4 - -config ADK_TARGET_ROOT_EXT4 - bool "EXT4" - select ADK_KERNEL_EXT4_FS - help - Compile EXT4 filesystem into kernel and use it as root filesystem. - -config ADK_TARGET_ROOT_XFS - bool "XFS" - select ADK_KERNEL_XFS_FS - help - Compile XFS filesystem into kernel and use it as root filesystem. - -config ADK_TARGET_ROOT_EXT2 - bool "EXT2" - select ADK_KERNEL_EXT2_FS - help - Compile EXT2 filesystem into kernel and use it as root filesystem. - -config ADK_TARGET_ROOT_EXT3 - bool "EXT3" - select ADK_KERNEL_EXT3_FS - help - Compile EXT3 filesystem into kernel and use it as root filesystem. - -endchoice - -config ADK_TARGET_ROOTFS - string - default "xfs" if ADK_TARGET_ROOT_XFS - default "ext2" if ADK_TARGET_ROOT_EXT2 - default "ext3" if ADK_TARGET_ROOT_EXT3 - default "ext4" if ADK_TARGET_ROOT_EXT4 - |