From 220a96f9926788ed531717f78e44fdf1e7ab3b34 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 30 Dec 2010 22:45:29 +0100 Subject: rework architecture / embedded systems concept Make configuration of new targets cheap. Just add a new file in target/arch/sys-enabled/foo. See other files for syntax. While doing runtime tests with the new infrastructure I've updated a lot of other stuff: - gcc 4.5.2 - uClibc 0.9.32-rc1 (NPTL) - strongswan, php, miredo, parted, util-linux-ng, e2fsprogs I promise, this is the last big fat commit this year ;) --- mk/rootfs.mk | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'mk/rootfs.mk') diff --git a/mk/rootfs.mk b/mk/rootfs.mk index aab7d4ab1..5ad4e9381 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -3,29 +3,30 @@ define rootfs_template ifeq ($(ADK_TARGET_ROOTFS_$(2)),y) -FS:=$(1) +ADK_TARGET_FS:=$(1) FS_CMDLINE:=$(3) endif endef -ifeq ($(ADK_HARDWARE_QEMU_X86),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86),y) ROOTFS:= root=/dev/sda1 endif -ifeq ($(ADK_LINUX_MIPS_RB532),y) +ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y) ROOTFS:= root=/dev/sda2 MTDDEV:= root=/dev/mtdblock1 endif -ifeq ($(ADK_LINUX_MIPS_RB433),y) +ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB433),y) MTDDEV:= root=/dev/mtdblock2 endif -ifeq ($(ADK_LINUX_ARM_FOXG20),y) +ifeq ($(ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20),y) ROOTFS:= root=/dev/mmcblk0p2 rootwait endif -$(eval $(call rootfs_template,ext2-block,EXT2_BLOCK,$(ROOTFS))) +$(eval $(call rootfs_template,cf,CF,$(ROOTFS))) +$(eval $(call rootfs_template,mmc,MMC,$(ROOTFS))) $(eval $(call rootfs_template,usb,USB,rootdelay=3)) $(eval $(call rootfs_template,archive,ARCHIVE,$(ROOTFS))) $(eval $(call rootfs_template,initramfs,INITRAMFS)) @@ -35,4 +36,4 @@ $(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3)) $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp init=/init)) $(eval $(call rootfs_template,encrypted,ENCRYPTED)) -export FS +export ADK_TARGET_FS -- cgit v1.2.3