From 7a792e2f3fd515657da9dc0537a6e32a2cc06180 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 5 Aug 2007 06:42:00 +0000 Subject: [PATCH] rename u-boot[-mkimage]-gta01[-native] to u-boot[-mkimage]-openmoko[-native] --- packages/linux/linux-gta01.inc | 2 +- packages/linux/linux-gta01_2.6.21.3.bb | 2 +- packages/linux/linux-gta01_2.6.21.5.bb | 2 +- packages/linux/linux-smdk2443_2.6.20+git.bb | 2 +- packages/linux/linux.inc | 10 ++--- .../.mtn2git_empty | 0 .../bbt-create-optional.patch | 0 .../bbt-scan-second.patch | 0 .../boot-from-ram-and-nand.patch | 0 .../boot-from-ram-reloc.patch | 0 .../boot-menu.patch | 0 .../cmd-unzip.patch | 0 .../console-ansi.patch | 0 .../default-env.patch | 0 .../dontask.patch | 0 .../dynenv-harden.patch | 0 .../early-powerdown.patch | 0 .../enable-splash-bmp.patch | 0 .../env_nand_oob.patch | 0 .../ext2load_hex.patch | 0 .../lowlevel_foo.patch | 0 .../mmcinit-power-up.patch | 0 .../nand-badisbad.patch | 0 .../nand-createbbt.patch | 0 .../nand-dynamic_partitions.patch | 0 .../nand-otp.patch | 0 .../nand-read_write_oob.patch | 0 .../neo1973-chargefast.patch | 0 .../preboot-override.patch | 0 .../raise-limits.patch | 0 .../series | 0 .../splashimage-command.patch | 0 .../uboot-20061030-neo1973.patch | 0 .../uboot-20061030-qt2410.patch | 0 .../uboot-arm920_s3c2410_irq_demux.patch | 0 .../uboot-arm920t-gd_in_irq.patch | 0 .../uboot-bbt-quiet.patch | 0 .../uboot-cmd_s3c2410.patch | 0 .../uboot-cramfs_but_no_jffs2.patch | 0 .../uboot-dfu.patch | 0 .../uboot-gta02.patch | 0 .../uboot-hxd8.patch | 0 .../uboot-license.patch | 0 .../uboot-machtypes.patch | 0 .../uboot-mokoversion.patch | 0 .../uboot-nand-markbad-reallybad.patch | 0 .../uboot-neo1973-defaultenv.patch | 0 .../uboot-neo1973-resume.patch | 0 .../uboot-s3c2410-misccr-definitions.patch | 0 .../uboot-s3c2410-mmc.patch | 0 .../uboot-s3c2410-nand.patch | 0 .../uboot-s3c2410-norelocate_irqvec_cpy.patch | 0 .../uboot-s3c2410-warnings-fix.patch | 0 .../uboot-s3c2410_fb.patch | 0 .../uboot-s3c2410_udc.patch | 0 .../uboot-s3c2440.patch | 0 .../uboot-s3c2443.patch | 0 .../uboot-smdk2440.patch | 0 .../uboot-smdk2443.patch | 0 .../uboot-strtoul.patch | 0 .../uboot-usbtty-acm.patch | 0 .../unbusy-i2c.patch | 0 .../usbdcore-multiple_configs.patch | 0 .../wakeup-reason-nand-only.patch | 0 ...b => u-boot-mkimage-openmoko-native_oe.bb} | 0 ...oot-gta01_svn.bb => uboot-openmoko_svn.bb} | 43 ++++++++++--------- 66 files changed, 32 insertions(+), 29 deletions(-) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/.mtn2git_empty (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/bbt-create-optional.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/bbt-scan-second.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/boot-from-ram-and-nand.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/boot-from-ram-reloc.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/boot-menu.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/cmd-unzip.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/console-ansi.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/default-env.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/dontask.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/dynenv-harden.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/early-powerdown.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/enable-splash-bmp.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/env_nand_oob.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/ext2load_hex.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/lowlevel_foo.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/mmcinit-power-up.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/nand-badisbad.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/nand-createbbt.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/nand-dynamic_partitions.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/nand-otp.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/nand-read_write_oob.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/neo1973-chargefast.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/preboot-override.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/raise-limits.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/series (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/splashimage-command.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-20061030-neo1973.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-20061030-qt2410.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-arm920_s3c2410_irq_demux.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-arm920t-gd_in_irq.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-bbt-quiet.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-cmd_s3c2410.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-cramfs_but_no_jffs2.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-dfu.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-gta02.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-hxd8.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-license.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-machtypes.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-mokoversion.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-nand-markbad-reallybad.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-neo1973-defaultenv.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-neo1973-resume.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-s3c2410-misccr-definitions.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-s3c2410-mmc.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-s3c2410-nand.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-s3c2410-norelocate_irqvec_cpy.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-s3c2410-warnings-fix.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-s3c2410_fb.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-s3c2410_udc.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-s3c2440.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-s3c2443.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-smdk2440.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-smdk2443.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-strtoul.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/uboot-usbtty-acm.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/unbusy-i2c.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/usbdcore-multiple_configs.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native => u-boot-mkimage-openmoko-native}/wakeup-reason-nand-only.patch (100%) rename packages/uboot/{u-boot-mkimage-gta01-native_oe.bb => u-boot-mkimage-openmoko-native_oe.bb} (100%) rename packages/uboot/{uboot-gta01_svn.bb => uboot-openmoko_svn.bb} (61%) diff --git a/packages/linux/linux-gta01.inc b/packages/linux/linux-gta01.inc index 098ae9d069..7cc6c58b6b 100644 --- a/packages/linux/linux-gta01.inc +++ b/packages/linux/linux-gta01.inc @@ -3,7 +3,7 @@ SECTION = "kernel" AUTHOR = "Harald Welte " HOMEPAGE = "N/A" LICENSE = "GPL" -DEPENDS += "quilt-native uboot-gta01" +DEPENDS += "quilt-native uboot-openmoko" inherit kernel diff --git a/packages/linux/linux-gta01_2.6.21.3.bb b/packages/linux/linux-gta01_2.6.21.3.bb index cccc4dd6a1..18af85973a 100644 --- a/packages/linux/linux-gta01_2.6.21.3.bb +++ b/packages/linux/linux-gta01_2.6.21.3.bb @@ -4,7 +4,7 @@ SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto= SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1" MOKOR = "moko10" -PR = "${MOKOR}-r3" +PR = "${MOKOR}-r4" VANILLA_VERSION = "2.6.21.3" diff --git a/packages/linux/linux-gta01_2.6.21.5.bb b/packages/linux/linux-gta01_2.6.21.5.bb index ced24462e7..9463138cf0 100644 --- a/packages/linux/linux-gta01_2.6.21.5.bb +++ b/packages/linux/linux-gta01_2.6.21.5.bb @@ -4,7 +4,7 @@ SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto= SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1" MOKOR = "moko10" -PR = "${MOKOR}-r1" +PR = "r2" VANILLA_VERSION = "2.6.21.5" diff --git a/packages/linux/linux-smdk2443_2.6.20+git.bb b/packages/linux/linux-smdk2443_2.6.20+git.bb index b97ebd7327..6d129baea1 100644 --- a/packages/linux/linux-smdk2443_2.6.20+git.bb +++ b/packages/linux/linux-smdk2443_2.6.20+git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Linux Kernel for smdk2443 compatible machines" SECTION = "kernel" LICENSE = "GPL" -DEPENDS += "u-boot-mkimage-gta01-native" +DEPENDS += "u-boot-mkimage-openmoko-native" PR = "r1" diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 1e4e58b089..cd347cb674 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -3,11 +3,11 @@ SECTION = "kernel" LICENSE = "GPL" # These devices need mkimage to generate a kernel image -DEPENDS_kb9202 = "u-boot-mkimage-gta01-native" -DEPENDS_at32stk1000 = "u-boot-mkimage-gta01-native" -DEPENDS_atngw100 = "u-boot-mkimage-gta01-native" -DEPENDS_at91sam9263ek = "u-boot-mkimage-gta01-native" -DEPENDS_sarge-at91 = "u-boot-mkimage-gta01-native" +DEPENDS_kb9202 = "u-boot-mkimage-openmoko-native" +DEPENDS_at32stk1000 = "u-boot-mkimage-openmoko-native" +DEPENDS_atngw100 = "u-boot-mkimage-openmoko-native" +DEPENDS_at91sam9263ek = "u-boot-mkimage-openmoko-native" +DEPENDS_sarge-at91 = "u-boot-mkimage-openmoko-native" inherit kernel diff --git a/packages/uboot/u-boot-mkimage-gta01-native/.mtn2git_empty b/packages/uboot/u-boot-mkimage-openmoko-native/.mtn2git_empty similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/.mtn2git_empty rename to packages/uboot/u-boot-mkimage-openmoko-native/.mtn2git_empty diff --git a/packages/uboot/u-boot-mkimage-gta01-native/bbt-create-optional.patch b/packages/uboot/u-boot-mkimage-openmoko-native/bbt-create-optional.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/bbt-create-optional.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/bbt-create-optional.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/bbt-scan-second.patch b/packages/uboot/u-boot-mkimage-openmoko-native/bbt-scan-second.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/bbt-scan-second.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/bbt-scan-second.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-and-nand.patch b/packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-and-nand.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-and-nand.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-and-nand.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-reloc.patch b/packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-reloc.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-reloc.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-reloc.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/boot-menu.patch b/packages/uboot/u-boot-mkimage-openmoko-native/boot-menu.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/boot-menu.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/boot-menu.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/cmd-unzip.patch b/packages/uboot/u-boot-mkimage-openmoko-native/cmd-unzip.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/cmd-unzip.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/cmd-unzip.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/console-ansi.patch b/packages/uboot/u-boot-mkimage-openmoko-native/console-ansi.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/console-ansi.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/console-ansi.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/default-env.patch b/packages/uboot/u-boot-mkimage-openmoko-native/default-env.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/default-env.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/default-env.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/dontask.patch b/packages/uboot/u-boot-mkimage-openmoko-native/dontask.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/dontask.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/dontask.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/dynenv-harden.patch b/packages/uboot/u-boot-mkimage-openmoko-native/dynenv-harden.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/dynenv-harden.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/dynenv-harden.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/early-powerdown.patch b/packages/uboot/u-boot-mkimage-openmoko-native/early-powerdown.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/early-powerdown.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/early-powerdown.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/enable-splash-bmp.patch b/packages/uboot/u-boot-mkimage-openmoko-native/enable-splash-bmp.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/enable-splash-bmp.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/enable-splash-bmp.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/env_nand_oob.patch b/packages/uboot/u-boot-mkimage-openmoko-native/env_nand_oob.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/env_nand_oob.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/env_nand_oob.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/ext2load_hex.patch b/packages/uboot/u-boot-mkimage-openmoko-native/ext2load_hex.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/ext2load_hex.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/ext2load_hex.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/lowlevel_foo.patch b/packages/uboot/u-boot-mkimage-openmoko-native/lowlevel_foo.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/lowlevel_foo.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/lowlevel_foo.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/mmcinit-power-up.patch b/packages/uboot/u-boot-mkimage-openmoko-native/mmcinit-power-up.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/mmcinit-power-up.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/mmcinit-power-up.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/nand-badisbad.patch b/packages/uboot/u-boot-mkimage-openmoko-native/nand-badisbad.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/nand-badisbad.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/nand-badisbad.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/nand-createbbt.patch b/packages/uboot/u-boot-mkimage-openmoko-native/nand-createbbt.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/nand-createbbt.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/nand-createbbt.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/nand-dynamic_partitions.patch b/packages/uboot/u-boot-mkimage-openmoko-native/nand-dynamic_partitions.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/nand-dynamic_partitions.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/nand-dynamic_partitions.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/nand-otp.patch b/packages/uboot/u-boot-mkimage-openmoko-native/nand-otp.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/nand-otp.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/nand-otp.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/nand-read_write_oob.patch b/packages/uboot/u-boot-mkimage-openmoko-native/nand-read_write_oob.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/nand-read_write_oob.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/nand-read_write_oob.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/neo1973-chargefast.patch b/packages/uboot/u-boot-mkimage-openmoko-native/neo1973-chargefast.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/neo1973-chargefast.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/neo1973-chargefast.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/preboot-override.patch b/packages/uboot/u-boot-mkimage-openmoko-native/preboot-override.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/preboot-override.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/preboot-override.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/raise-limits.patch b/packages/uboot/u-boot-mkimage-openmoko-native/raise-limits.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/raise-limits.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/raise-limits.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/series b/packages/uboot/u-boot-mkimage-openmoko-native/series similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/series rename to packages/uboot/u-boot-mkimage-openmoko-native/series diff --git a/packages/uboot/u-boot-mkimage-gta01-native/splashimage-command.patch b/packages/uboot/u-boot-mkimage-openmoko-native/splashimage-command.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/splashimage-command.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/splashimage-command.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-neo1973.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-neo1973.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-qt2410.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-qt2410.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920_s3c2410_irq_demux.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920_s3c2410_irq_demux.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920_s3c2410_irq_demux.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920_s3c2410_irq_demux.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920t-gd_in_irq.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920t-gd_in_irq.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920t-gd_in_irq.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920t-gd_in_irq.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-bbt-quiet.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-bbt-quiet.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-bbt-quiet.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-bbt-quiet.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-cmd_s3c2410.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-cmd_s3c2410.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-cramfs_but_no_jffs2.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-cramfs_but_no_jffs2.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-dfu.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-dfu.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-dfu.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-dfu.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-gta02.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-gta02.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-gta02.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-gta02.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-hxd8.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-hxd8.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-license.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-license.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-license.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-license.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-machtypes.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-machtypes.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-machtypes.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-machtypes.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-mokoversion.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-mokoversion.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-mokoversion.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-mokoversion.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-nand-markbad-reallybad.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-nand-markbad-reallybad.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-nand-markbad-reallybad.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-nand-markbad-reallybad.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-resume.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-resume.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-resume.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-resume.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-misccr-definitions.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-misccr-definitions.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-misccr-definitions.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-misccr-definitions.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-mmc.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-mmc.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-nand.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-nand.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-norelocate_irqvec_cpy.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-norelocate_irqvec_cpy.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-norelocate_irqvec_cpy.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-norelocate_irqvec_cpy.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-warnings-fix.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-warnings-fix.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-warnings-fix.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-warnings-fix.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_fb.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_fb.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_udc.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_udc.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2440.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2440.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2440.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2440.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2443.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2443.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2440.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2440.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2443.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2443.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-strtoul.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-strtoul.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-strtoul.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-strtoul.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/uboot-usbtty-acm.patch b/packages/uboot/u-boot-mkimage-openmoko-native/uboot-usbtty-acm.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/uboot-usbtty-acm.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/uboot-usbtty-acm.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/unbusy-i2c.patch b/packages/uboot/u-boot-mkimage-openmoko-native/unbusy-i2c.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/unbusy-i2c.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/unbusy-i2c.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/usbdcore-multiple_configs.patch b/packages/uboot/u-boot-mkimage-openmoko-native/usbdcore-multiple_configs.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/usbdcore-multiple_configs.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/usbdcore-multiple_configs.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native/wakeup-reason-nand-only.patch b/packages/uboot/u-boot-mkimage-openmoko-native/wakeup-reason-nand-only.patch similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native/wakeup-reason-nand-only.patch rename to packages/uboot/u-boot-mkimage-openmoko-native/wakeup-reason-nand-only.patch diff --git a/packages/uboot/u-boot-mkimage-gta01-native_oe.bb b/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb similarity index 100% rename from packages/uboot/u-boot-mkimage-gta01-native_oe.bb rename to packages/uboot/u-boot-mkimage-openmoko-native_oe.bb diff --git a/packages/uboot/uboot-gta01_svn.bb b/packages/uboot/uboot-openmoko_svn.bb similarity index 61% rename from packages/uboot/uboot-gta01_svn.bb rename to packages/uboot/uboot-openmoko_svn.bb index 98622fe408..bb9bde7733 100644 --- a/packages/uboot/uboot-gta01_svn.bb +++ b/packages/uboot/uboot-openmoko_svn.bb @@ -44,33 +44,36 @@ do_configure_prepend() { } do_compile () { - chmod +x board/neo1973/gta*/split_by_variant.sh - for mach in ${UBOOT_MACHINES} - do - oe_runmake ${mach}_config - oe_runmake clean - oe_runmake all - oe_runmake u-boot.udfu - if [ -f u-boot.udfu ]; then - mv u-boot.udfu u-boot_${mach}.bin - else - mv u-boot.bin u-boot_${mach}.bin - fi - if [ -f board/${mach}/lowlevel_foo.bin ]; then - mv board/${mach}/lowlevel_foo.bin lowlevel_foo_${mach}.bin - fi - done + chmod +x board/neo1973/gta*/split_by_variant.sh + for mach in ${UBOOT_MACHINES} + do + oe_runmake ${mach}_config + oe_runmake clean + find board -name lowlevel_foo.bin -exec rm '{}' \; + oe_runmake all + oe_runmake u-boot.udfu + if [ -f u-boot.udfu ]; then + mv u-boot.udfu u-boot_${mach}.bin + else + mv u-boot.bin u-boot_${mach}.bin + fi + if [ -f board/${mach}/lowlevel_foo.bin ]; then + mv board/${mach}/lowlevel_foo.bin \ + lowlevel_foo_${mach}.bin + else + find board -name lowlevel_foo.bin \ + -exec mv '{}' lowlevel_foo_${mach}.bin \; + fi + done } do_deploy () { install -d ${DEPLOY_DIR_IMAGE} for mach in ${UBOOT_MACHINES} do - install -m 0644 ${S}/u-boot_${mach}.bin \ - ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PR}.bin + install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then - install -m 0644 ${S}/lowlevel_foo_${mach}.bin \ - ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PR}.bin + install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin fi done install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage -- 2.39.5