From 2df4c1b23d36ca7552b089a86fa742d080882aec Mon Sep 17 00:00:00 2001 From: Jens Lucius Date: Mon, 10 Aug 2015 14:10:59 +0200 Subject: [PATCH 1/2] Use correct u-boot name for meleg Mainline u-boot uses a different name for the configuration for the Mele G. Use correct name for mainline, use old name for sunxi u-boot. Signed-off-by: Jens Lucius --- conf/machine/meleg.conf | 2 +- recipes-bsp/u-boot/u-boot-sunxi.bb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/machine/meleg.conf b/conf/machine/meleg.conf index d1b0930..e656daa 100644 --- a/conf/machine/meleg.conf +++ b/conf/machine/meleg.conf @@ -4,5 +4,5 @@ require conf/machine/include/sun4i.inc -UBOOT_MACHINE = "Mele_A1000G_config" +UBOOT_MACHINE = "Mele_A1000G_quad" SUNXI_FEX_FILE = "sys_config/a10/mele_a1000g.fex" \ No newline at end of file diff --git a/recipes-bsp/u-boot/u-boot-sunxi.bb b/recipes-bsp/u-boot/u-boot-sunxi.bb index 761ba8d..cdf0fda 100644 --- a/recipes-bsp/u-boot/u-boot-sunxi.bb +++ b/recipes-bsp/u-boot/u-boot-sunxi.bb @@ -16,6 +16,7 @@ DEFAULT_PREFERENCE_sun7i="1" # Sunxi U-Boot uses different names for some boards UBOOT_MACHINE_olinuxino-a20 = "A20-OLinuXino-Micro_config" UBOOT_MACHINE_olinuxino-a10s = "A10s-OLinuXino-Micro_config" +UBOOT_MACHINE_meleg = "Mele_A1000G_config" SRC_URI = "git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi" From 4d45bd5262aeb5c0581e9e6464a2d6b798043530 Mon Sep 17 00:00:00 2001 From: Jens Lucius Date: Mon, 10 Aug 2015 15:02:03 +0200 Subject: [PATCH 2/2] add missing _config to meleg Signed-off-by: Jens Lucius --- conf/machine/meleg.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/meleg.conf b/conf/machine/meleg.conf index e656daa..bc28189 100644 --- a/conf/machine/meleg.conf +++ b/conf/machine/meleg.conf @@ -4,5 +4,5 @@ require conf/machine/include/sun4i.inc -UBOOT_MACHINE = "Mele_A1000G_quad" +UBOOT_MACHINE = "Mele_A1000G_quad_config" SUNXI_FEX_FILE = "sys_config/a10/mele_a1000g.fex" \ No newline at end of file