From 7445093b5e8f0e7cff25a65ca08cc7cc6a83a438 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Sat, 3 Dec 2011 13:32:17 +0800 Subject: LINARO: Removed all existing flavours Signed-off-by: Eric Miao --- .../config/armel/config.flavour.linaro-mx51 | 36 ------------------- .../config/armel/config.flavour.linaro-omap | 42 ---------------------- .../config/armel/config.flavour.linaro-vexpress | 41 --------------------- debian.linaro/control.d/vars.linaro-mx51 | 8 ----- debian.linaro/control.d/vars.linaro-omap | 8 ----- debian.linaro/control.d/vars.linaro-vexpress | 8 ----- .../d-i/exclude-modules.armel-linaro-mx51 | 18 ---------- .../d-i/exclude-modules.armel-linaro-omap | 19 ---------- .../d-i/exclude-modules.armel-linaro-s5pv310 | 19 ---------- .../d-i/exclude-modules.armel-linaro-u8500 | 21 ----------- .../d-i/exclude-modules.armel-linaro-vexpress | 21 ----------- debian.linaro/d-i/kernel-versions.in | 6 ++-- debian.linaro/rules.d/armel.mk | 2 +- 13 files changed, 4 insertions(+), 245 deletions(-) delete mode 100644 debian.linaro/config/armel/config.flavour.linaro-mx51 delete mode 100644 debian.linaro/config/armel/config.flavour.linaro-omap delete mode 100644 debian.linaro/config/armel/config.flavour.linaro-vexpress delete mode 100644 debian.linaro/control.d/vars.linaro-mx51 delete mode 100644 debian.linaro/control.d/vars.linaro-omap delete mode 100644 debian.linaro/control.d/vars.linaro-vexpress delete mode 100644 debian.linaro/d-i/exclude-modules.armel-linaro-mx51 delete mode 100644 debian.linaro/d-i/exclude-modules.armel-linaro-omap delete mode 100644 debian.linaro/d-i/exclude-modules.armel-linaro-s5pv310 delete mode 100644 debian.linaro/d-i/exclude-modules.armel-linaro-u8500 delete mode 100644 debian.linaro/d-i/exclude-modules.armel-linaro-vexpress diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51 deleted file mode 100644 index 63e76ee11e4..00000000000 --- a/debian.linaro/config/armel/config.flavour.linaro-mx51 +++ /dev/null @@ -1,36 +0,0 @@ -# -# Config options for config.flavour.linaro-mx51 automatically generated by splitconfig.pl -# -CONFIG_ARCH_MXC=y -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_VEXPRESS is not set -CONFIG_ARM_L1_CACHE_SHIFT=6 -CONFIG_ARM_THUMBEE=y -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set -CONFIG_CMDLINE="" -# CONFIG_DISPLAY_SUPPORT is not set -# CONFIG_DRM is not set -# CONFIG_FB_MODE_HELPERS is not set -# CONFIG_FB_TILEBLITTING is not set -# CONFIG_FIRMWARE_EDID is not set -# CONFIG_FONTS is not set -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -CONFIG_GPIOLIB=y -CONFIG_HZ=100 -CONFIG_MAC80211_RC_DEFAULT="pid" -# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set -CONFIG_MAC80211_RC_DEFAULT_PID=y -# CONFIG_MFD_CORE is not set -# CONFIG_MMC_UNSAFE_RESUME is not set -# CONFIG_MTD_ARM_INTEGRATOR is not set -CONFIG_NOP_USB_XCEIV=y -# CONFIG_SND_DYNAMIC_MINORS is not set -# CONFIG_TWL4030_CORE is not set -CONFIG_USB_ARCH_HAS_EHCI=y -# CONFIG_USB_ARCH_HAS_OHCI is not set -CONFIG_USB_EHCI_ROOT_HUB_TT=y -# CONFIG_USB_GADGET is not set -# CONFIG_USB_ISP1760_HCD is not set -# CONFIG_USB_OTG is not set -CONFIG_W1=y diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap deleted file mode 100644 index 4f0cec37004..00000000000 --- a/debian.linaro/config/armel/config.flavour.linaro-omap +++ /dev/null @@ -1,42 +0,0 @@ -# -# Config options for config.flavour.linaro-omap automatically generated by splitconfig.pl -# -# CONFIG_ARCH_MXC is not set -CONFIG_ARCH_OMAP=y -# CONFIG_ARCH_VEXPRESS is not set -# CONFIG_ARM_ERRATA_751472 is not set -# CONFIG_ARM_ERRATA_753970 is not set -CONFIG_ARM_L1_CACHE_SHIFT=5 -CONFIG_ARM_THUMBEE=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200" -CONFIG_DISPLAY_SUPPORT=y -CONFIG_DRM=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FONTS=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -CONFIG_GPIOLIB=y -CONFIG_HZ=128 -CONFIG_MAC80211_RC_DEFAULT="pid" -# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set -CONFIG_MAC80211_RC_DEFAULT_PID=y -CONFIG_MFD_CORE=y -CONFIG_MMC_UNSAFE_RESUME=y -# CONFIG_MTD_ARM_INTEGRATOR is not set -CONFIG_NOP_USB_XCEIV=y -CONFIG_NR_CPUS=2 -CONFIG_PL310_ERRATA_588369=y -CONFIG_PL310_ERRATA_727915=y -CONFIG_SND_DYNAMIC_MINORS=y -CONFIG_TWL4030_CODEC=y -CONFIG_TWL4030_CORE=y -CONFIG_USB_ARCH_HAS_EHCI=y -CONFIG_USB_ARCH_HAS_OHCI=y -# CONFIG_USB_EHCI_ROOT_HUB_TT is not set -CONFIG_USB_GADGET=y -# CONFIG_USB_ISP1760_HCD is not set -CONFIG_USB_OTG=y -CONFIG_W1=y diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress deleted file mode 100644 index 2030e40f582..00000000000 --- a/debian.linaro/config/armel/config.flavour.linaro-vexpress +++ /dev/null @@ -1,41 +0,0 @@ -# -# Config options for config.flavour.linaro-vexpress automatically generated by splitconfig.pl -# -# CONFIG_ARCH_MXC is not set -# CONFIG_ARCH_OMAP is not set -CONFIG_ARCH_VEXPRESS=y -CONFIG_ARM_ERRATA_751472=y -CONFIG_ARM_ERRATA_753970=y -CONFIG_ARM_L1_CACHE_SHIFT=5 -# CONFIG_ARM_THUMBEE is not set -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set -CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M" -# CONFIG_DISPLAY_SUPPORT is not set -# CONFIG_DRM is not set -# CONFIG_FB_MODE_HELPERS is not set -# CONFIG_FB_TILEBLITTING is not set -# CONFIG_FIRMWARE_EDID is not set -# CONFIG_FONTS is not set -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -# CONFIG_GPIOLIB is not set -CONFIG_HZ=100 -CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" -CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -# CONFIG_MAC80211_RC_DEFAULT_PID is not set -# CONFIG_MFD_CORE is not set -# CONFIG_MMC_UNSAFE_RESUME is not set -CONFIG_MTD_ARM_INTEGRATOR=y -# CONFIG_NOP_USB_XCEIV is not set -CONFIG_NR_CPUS=4 -# CONFIG_PL310_ERRATA_588369 is not set -# CONFIG_PL310_ERRATA_727915 is not set -# CONFIG_SND_DYNAMIC_MINORS is not set -# CONFIG_TWL4030_CODEC is not set -CONFIG_TWL4030_CORE=y -# CONFIG_USB_ARCH_HAS_EHCI is not set -# CONFIG_USB_ARCH_HAS_OHCI is not set -CONFIG_USB_GADGET=y -CONFIG_USB_ISP1760_HCD=y -CONFIG_USB_OTG=y -# CONFIG_W1 is not set diff --git a/debian.linaro/control.d/vars.linaro-mx51 b/debian.linaro/control.d/vars.linaro-mx51 deleted file mode 100644 index d48c7e1b292..00000000000 --- a/debian.linaro/control.d/vars.linaro-mx51 +++ /dev/null @@ -1,8 +0,0 @@ -arch="armel" -supported="Freescale i.MX51" -desc="Freescale i.MX51 based platforms" -target="Freescale Babbage platform" -bootloader="uboot-mkimage, flash-kernel" -provides="" -section_image="universe/base" -do_debug="Yes" diff --git a/debian.linaro/control.d/vars.linaro-omap b/debian.linaro/control.d/vars.linaro-omap deleted file mode 100644 index a7f41642ba2..00000000000 --- a/debian.linaro/control.d/vars.linaro-omap +++ /dev/null @@ -1,8 +0,0 @@ -arch="armel" -supported="TI OMAP[34]" -desc="TI OMAP[34]-based systems" -target="Targeted towards boards such as Beagleboard, PandaBoard, Gumstix, IGEPv2, etc." -bootloader="uboot-mkimage, flash-kernel" -provides="" -section_image="universe/base" -do_debug="Yes" diff --git a/debian.linaro/control.d/vars.linaro-vexpress b/debian.linaro/control.d/vars.linaro-vexpress deleted file mode 100644 index cce249ebe7a..00000000000 --- a/debian.linaro/control.d/vars.linaro-vexpress +++ /dev/null @@ -1,8 +0,0 @@ -arch="armel" -supported="ARM Versatile Express" -desc="ARM Versatile Express with CortexA9x4 tile" -target="CA9x4" -bootloader="uboot-mkimage, flash-kernel" -provides="" -section_image="universe/base" -do_debug="Yes" diff --git a/debian.linaro/d-i/exclude-modules.armel-linaro-mx51 b/debian.linaro/d-i/exclude-modules.armel-linaro-mx51 deleted file mode 100644 index f08c68a5bcb..00000000000 --- a/debian.linaro/d-i/exclude-modules.armel-linaro-mx51 +++ /dev/null @@ -1,18 +0,0 @@ -block-modules -fat-modules -fs-core-modules -fs-secondary-modules -input-modules -irda-modules -md-modules -nfs-modules -nic-modules -nic-usb-modules -parport-modules -plip-modules -ppp-modules -sata-modules -scsi-modules -squashfs-modules -usb-modules -vlan-modules diff --git a/debian.linaro/d-i/exclude-modules.armel-linaro-omap b/debian.linaro/d-i/exclude-modules.armel-linaro-omap deleted file mode 100644 index 5d85652a527..00000000000 --- a/debian.linaro/d-i/exclude-modules.armel-linaro-omap +++ /dev/null @@ -1,19 +0,0 @@ -block-modules -fat-modules -fs-core-modules -fs-secondary-modules -input-modules -irda-modules -md-modules -mouse-modules -nfs-modules -nic-usb-modules -parport-modules -plip-modules -ppp-modules -sata-modules -scsi-modules -squashfs-modules -storage-core-modules -usb-modules -vlan-modules diff --git a/debian.linaro/d-i/exclude-modules.armel-linaro-s5pv310 b/debian.linaro/d-i/exclude-modules.armel-linaro-s5pv310 deleted file mode 100644 index 5d85652a527..00000000000 --- a/debian.linaro/d-i/exclude-modules.armel-linaro-s5pv310 +++ /dev/null @@ -1,19 +0,0 @@ -block-modules -fat-modules -fs-core-modules -fs-secondary-modules -input-modules -irda-modules -md-modules -mouse-modules -nfs-modules -nic-usb-modules -parport-modules -plip-modules -ppp-modules -sata-modules -scsi-modules -squashfs-modules -storage-core-modules -usb-modules -vlan-modules diff --git a/debian.linaro/d-i/exclude-modules.armel-linaro-u8500 b/debian.linaro/d-i/exclude-modules.armel-linaro-u8500 deleted file mode 100644 index 531dfaff72c..00000000000 --- a/debian.linaro/d-i/exclude-modules.armel-linaro-u8500 +++ /dev/null @@ -1,21 +0,0 @@ -block-modules -fat-modules -fs-core-modules -fs-secondary-modules -input-modules -irda-modules -md-modules -mouse-modules -nfs-modules -nic-modules -nic-shared-modules -nic-usb-modules -parport-modules -plip-modules -ppp-modules -sata-modules -scsi-modules -squashfs-modules -storage-core-modules -usb-modules -vlan-modules diff --git a/debian.linaro/d-i/exclude-modules.armel-linaro-vexpress b/debian.linaro/d-i/exclude-modules.armel-linaro-vexpress deleted file mode 100644 index 531dfaff72c..00000000000 --- a/debian.linaro/d-i/exclude-modules.armel-linaro-vexpress +++ /dev/null @@ -1,21 +0,0 @@ -block-modules -fat-modules -fs-core-modules -fs-secondary-modules -input-modules -irda-modules -md-modules -mouse-modules -nfs-modules -nic-modules -nic-shared-modules -nic-usb-modules -parport-modules -plip-modules -ppp-modules -sata-modules -scsi-modules -squashfs-modules -storage-core-modules -usb-modules -vlan-modules diff --git a/debian.linaro/d-i/kernel-versions.in b/debian.linaro/d-i/kernel-versions.in index 247c1eaee8c..6c836a0ece7 100644 --- a/debian.linaro/d-i/kernel-versions.in +++ b/debian.linaro/d-i/kernel-versions.in @@ -1,8 +1,8 @@ # arch version flavour installedname suffix bdep -armel PKGVER-ABINUM linaro-mx51 PKGVER-ABINUM-linaro-mx51 - -armel PKGVER-ABINUM linaro-omap PKGVER-ABINUM-linaro-omap - +#armel PKGVER-ABINUM linaro-mx51 PKGVER-ABINUM-linaro-mx51 - +#armel PKGVER-ABINUM linaro-omap PKGVER-ABINUM-linaro-omap - #armel PKGVER-ABINUM linaro-s5pv310 PKGVER-ABINUM-linaro-s5pv310 - #armel PKGVER-ABINUM linaro-u8500 PKGVER-ABINUM-linaro-u8500 - -armel PKGVER-ABINUM linaro-vexpress PKGVER-ABINUM-linaro-vexpress - +#armel PKGVER-ABINUM linaro-vexpress PKGVER-ABINUM-linaro-vexpress - # Ports # arch version flavour installedname suffix bdep diff --git a/debian.linaro/rules.d/armel.mk b/debian.linaro/rules.d/armel.mk index b7760b3c2aa..301937020bb 100644 --- a/debian.linaro/rules.d/armel.mk +++ b/debian.linaro/rules.d/armel.mk @@ -2,7 +2,7 @@ build_arch = arm header_arch = arm asm_link = arm defconfig = defconfig -flavours = linaro-mx51 linaro-omap linaro-vexpress +flavours = build_image = zImage kernel_file = arch/$(build_arch)/boot/zImage install_file = vmlinuz -- cgit v1.2.3