From e2e71e5a0fe631557851fbe3b0729500315dcf59 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 18 Mar 2007 22:43:28 +0000 Subject: linkstation/turbostation/n2100 machine support: Clean up and rename --- conf/machine/linkstationppchd.conf | 7 ------- conf/machine/linkstationppchg.conf | 7 ------- conf/machine/lsppchd.conf | 7 +++++++ conf/machine/lsppchg.conf | 7 +++++++ conf/machine/n2100.conf | 10 ---------- conf/machine/turbostation.conf | 9 --------- 6 files changed, 14 insertions(+), 33 deletions(-) delete mode 100644 conf/machine/linkstationppchd.conf delete mode 100644 conf/machine/linkstationppchg.conf create mode 100644 conf/machine/lsppchd.conf create mode 100644 conf/machine/lsppchg.conf (limited to 'conf') diff --git a/conf/machine/linkstationppchd.conf b/conf/machine/linkstationppchd.conf deleted file mode 100644 index 52d58ded5b..0000000000 --- a/conf/machine/linkstationppchd.conf +++ /dev/null @@ -1,7 +0,0 @@ -#@TYPE: Machine -#@NAME: HD Linkstation -#@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD - -UBOOT_MACHINE = "linkstation_HDLAN" - -require conf/machine/include/linkstationppc.conf diff --git a/conf/machine/linkstationppchg.conf b/conf/machine/linkstationppchg.conf deleted file mode 100644 index b7ceb6fc95..0000000000 --- a/conf/machine/linkstationppchg.conf +++ /dev/null @@ -1,7 +0,0 @@ -#@TYPE: Machine -#@NAME: HG Linkstation -#@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG - -UBOOT_MACHINE = "linkstation_HGLAN" - -require conf/machine/include/linkstationppc.conf diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf new file mode 100644 index 0000000000..52d58ded5b --- /dev/null +++ b/conf/machine/lsppchd.conf @@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: HD Linkstation +#@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD + +UBOOT_MACHINE = "linkstation_HDLAN" + +require conf/machine/include/linkstationppc.conf diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf new file mode 100644 index 0000000000..b7ceb6fc95 --- /dev/null +++ b/conf/machine/lsppchg.conf @@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: HG Linkstation +#@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG + +UBOOT_MACHINE = "linkstation_HGLAN" + +require conf/machine/include/linkstationppc.conf diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf index 554157ca85..6aee9f1b71 100644 --- a/conf/machine/n2100.conf +++ b/conf/machine/n2100.conf @@ -11,17 +11,7 @@ MACHINE_FEATURES= "kernel26 usbhost" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.20" -# Do we need any kernel modules? -FOONAS_KERNEL = "kernel-module-ext2 kernel-module-usb-storage" - -FOONAS_SUPPORT += "fis" - # We want udev support in the image udevdir = "/dev" -BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm" -EXTRA_IMAGECMD_jffs2 += " --little-endian" -ERASEBLOCK_SIZE = "0x20000" -JFFS2_ROOTFS_SIZE = "0xC80000" -KERNEL_IMAGE_SIZE = "0x280000" require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf index 41dfd8d09e..a3856dbaf1 100644 --- a/conf/machine/turbostation.conf +++ b/conf/machine/turbostation.conf @@ -11,17 +11,8 @@ USE_VT="0" MODUTILS=26 MACHINE_FEATURES= "kernel26 usbhost" PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation" -FOONAS_KERNEL = "kernel-module-ext3 kernel-module-minix \ - kernel-module-usb-storage" # We want udev support in the image udevdir = "/dev" -BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm" -FOONAS_SUPPORT += "uboot-utils" -# Hardware stuff used in image generation -EXTRA_IMAGECMD = "--big-endian" -ERASEBLOCK_SIZE = "0x20000" -JFFS2_ROOTFS_SIZE = "0xC80000" -KERNEL_IMAGE_SIZE = "0x280000" require conf/machine/include/tune-ppc603e.conf -- cgit v1.2.3 From 0a60551a356b2e5c093832c3b8337d8a33106ee3 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 18 Mar 2007 22:51:07 +0000 Subject: foonas: Update defines for linkstations, n2100 and turbostation --- conf/distro/foonas.conf | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'conf') diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index 201d463732..75cfc926df 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -12,15 +12,33 @@ DISTRO_TYPE = "alpha" FEED_URIS = "foonas-packages##http://ipkg.foonas.org/${MACHINE}/cross/1.0-dev/packages" FEED_URIS += "foonas-kernel##http://ipkg.foonas.org/${MACHINE}/cross/1.0-dev/kernel" + +# Various defines for Thecus N2100 FOONAS_KERNEL_n2100 = "kernel-module-ext2 kernel-module-usb-storage" +FOONAS_SUPPORT_n2100 += "fis" +BOOTSTRAP_EXTRA_RDEPENDS_n2100 = "udev mdadm" +EXTRA_IMAGECMD_n2100 = "--little-endian" +ERASEBLOCK_SIZE_n2100 = "0x20000" +IMAGE_FSTYPES_n2100 = "jffs2" + +# Various defines for QNAP Turbostation FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \ kernel-module-usb-storage" -FOONAS_KERNEL_linkstationppchd = "kernel-module-dm-mod kernel-module-raid1 \ - kernel-module-raid0 kernel-module-raid456 \ - kernel-module-multipath" -FOONAS_KERNEL_linkstationppchg = "kernel-module-dm-mod kernel-module-raid1 \ +FOONAS_SUPPORT_turbostation += "uboot-utils" +BOOTSTRAP_EXTRA_RDEPENDS_turbostation = "udev mdadm" +EXTRA_IMAGECMD_turbostation = "--big-endian" +ERASEBLOCK_SIZE_turbostation = "0x20000" +IMAGE_FSTYPES_turbostation = "jffs2" + +# Various defines for Linkstations +FOONAS_KERNEL_lsppchg = "kernel-module-dm-mod kernel-module-raid1 \ kernel-module-raid0 kernel-module-raid456 \ kernel-module-multipath" +FOONAS_KERNEL_lsppchd = "${FOONAS_KERNEL_lsppchg}" +FOONAS_SUPPORT_lsppchd = "uboot-utils dtc" +FOONAS_SUPPORT_lsppchg = ${FOONAS_SUPPORT_lsppchd} +IMAGE_FSTYPES_lsppchd = "tar.gz" +IMAGE_FSTYPES_lsppchg = ${IMAGE_FSTYPES_lsppchd} # # Naming schemes @@ -30,9 +48,9 @@ INHERIT += "debian" # # Packaging and output format # + INHERIT += "package_ipk" IMAGE_BASENAME = "foonas" -IMAGE_FSTYPES = "jffs2" # # binutils and compilers -- cgit v1.2.3