[meta-freescale] [meta-fsl-arm-extra][PATCH][master] 2/3] u-boot-congatec-2013.04: Up to 29ea3cb0
Alex de Cabo
alejandro.de-cabo-garcia at congatec.com
Tue Dec 8 05:09:50 PST 2015
Provide recipe and patches which provide the 2013.04 u-boot version
Signed-off-by: Alex de Cabo <alejandro.de-cabo-garcia at congatec.com>
---
...d-header-file-needed-to-compile-with-gcc5.patch | 84 ++++++++++++++
.../u-boot/u-boot-congatec/0001-armv7-config.patch | 28 +++++
.../0001-kernel-add-support-for-gcc5.patch | 85 +++++++++++++++
...mon-main.c-make-show_boot_progress-__weak.patch | 31 ++++++
.../u-boot-congatec/0003-board-use-__weak.patch | 121 +++++++++++++++++++++
...the-gcc-inline-version-instead-of-the-c99.patch | 29 +++++
.../build-Fix-out-of-tree-build.patch | 39 +++++++
...gatec-Change-environment-mmcroot-variable.patch | 29 +++++
...oot-congatec-Change_environment_variables.patch | 46 ++++++++
recipes-bsp/u-boot/u-boot-congatec_2013.04.bb | 32 ++++++
10 files changed, 524 insertions(+)
create mode 100644 recipes-bsp/u-boot/u-boot-congatec/0001-add-header-file-needed-to-compile-with-gcc5.patch
create mode 100644 recipes-bsp/u-boot/u-boot-congatec/0001-armv7-config.patch
create mode 100644 recipes-bsp/u-boot/u-boot-congatec/0001-kernel-add-support-for-gcc5.patch
create mode 100644 recipes-bsp/u-boot/u-boot-congatec/0002-common-main.c-make-show_boot_progress-__weak.patch
create mode 100644 recipes-bsp/u-boot/u-boot-congatec/0003-board-use-__weak.patch
create mode 100644 recipes-bsp/u-boot/u-boot-congatec/0004-inline-use-the-gcc-inline-version-instead-of-the-c99.patch
create mode 100644 recipes-bsp/u-boot/u-boot-congatec/build-Fix-out-of-tree-build.patch
create mode 100644 recipes-bsp/u-boot/u-boot-congatec/u-boot-congatec-Change-environment-mmcroot-variable.patch
create mode 100644 recipes-bsp/u-boot/u-boot-congatec/u-boot-congatec-Change_environment_variables.patch
create mode 100644 recipes-bsp/u-boot/u-boot-congatec_2013.04.bb
diff --git a/recipes-bsp/u-boot/u-boot-congatec/0001-add-header-file-needed-to-compile-with-gcc5.patch b/recipes-bsp/u-boot/u-boot-congatec/0001-add-header-file-needed-to-compile-with-gcc5.patch
new file mode 100644
index 0000000..acea4e1
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-congatec/0001-add-header-file-needed-to-compile-with-gcc5.patch
@@ -0,0 +1,84 @@
+From c1b3a801c270c2cb3923259943eae0a02cb724e7 Mon Sep 17 00:00:00 2001
+From: Alex de Cabo <alejandro.de-cabo-garcia at congatec.com>
+Date: Mon, 28 Sep 2015 14:14:21 +0200
+Subject: [PATCH] add header file needed to compile with gcc5
+
+---
+ include/linux/compiler-gcc5.h | 65 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 65 insertions(+)
+ create mode 100644 include/linux/compiler-gcc5.h
+
+diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
+new file mode 100644
+index 0000000..c8c5659
+--- /dev/null
++++ b/include/linux/compiler-gcc5.h
+@@ -0,0 +1,65 @@
++#ifndef __LINUX_COMPILER_H
++#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
++#endif
++
++#define __used __attribute__((__used__))
++#define __must_check __attribute__((warn_unused_result))
++#define __compiler_offsetof(a, b) __builtin_offsetof(a, b)
++
++/* Mark functions as cold. gcc will assume any path leading to a call
++ to them will be unlikely. This means a lot of manual unlikely()s
++ are unnecessary now for any paths leading to the usual suspects
++ like BUG(), printk(), panic() etc. [but let's keep them for now for
++ older compilers]
++
++ Early snapshots of gcc 4.3 don't support this and we can't detect this
++ in the preprocessor, but we can live with this because they're unreleased.
++ Maketime probing would be overkill here.
++
++ gcc also has a __attribute__((__hot__)) to move hot functions into
++ a special section, but I don't see any sense in this right now in
++ the kernel context */
++#define __cold __attribute__((__cold__))
++
++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
++
++#ifndef __CHECKER__
++# define __compiletime_warning(message) __attribute__((warning(message)))
++# define __compiletime_error(message) __attribute__((error(message)))
++#endif /* __CHECKER__ */
++
++/*
++ * Mark a position in code as unreachable. This can be used to
++ * suppress control flow warnings after asm blocks that transfer
++ * control elsewhere.
++ *
++ * Early snapshots of gcc 4.5 don't support this and we can't detect
++ * this in the preprocessor, but we can live with this because they're
++ * unreleased. Really, we need to have autoconf for the kernel.
++ */
++#define unreachable() __builtin_unreachable()
++
++/* Mark a function definition as prohibited from being cloned. */
++#define __noclone __attribute__((__noclone__))
++
++/*
++ * Tell the optimizer that something else uses this function or variable.
++ */
++#define __visible __attribute__((externally_visible))
++
++/*
++ * GCC 'asm goto' miscompiles certain code sequences:
++ *
++ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
++ *
++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
++ *
++ * (asm goto is automatically volatile - the naming reflects this.)
++ */
++#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
++
++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
++#define __HAVE_BUILTIN_BSWAP32__
++#define __HAVE_BUILTIN_BSWAP64__
++#define __HAVE_BUILTIN_BSWAP16__
++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
+--
+1.9.1
+
diff --git a/recipes-bsp/u-boot/u-boot-congatec/0001-armv7-config.patch b/recipes-bsp/u-boot/u-boot-congatec/0001-armv7-config.patch
new file mode 100644
index 0000000..3a5834e
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-congatec/0001-armv7-config.patch
@@ -0,0 +1,28 @@
+From 2a9b04a70c2329c863a582679cccc2e9de3e33e3 Mon Sep 17 00:00:00 2001
+From: Alex de Cabo <alejandro.de-cabo-garcia at congatec.com>
+Date: Mon, 30 Nov 2015 10:16:41 +0100
+Subject: [PATCH] armv7: config
+
+ On supported platforms we set the bit which causes us to trap on unaligned
+ memory access. This is the opposite of what the compiler expects to be
+the default so we must pass in -mno-unaligned-access
+---
+ arch/arm/cpu/armv7/config.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/cpu/armv7/config.mk b/arch/arm/cpu/armv7/config.mk
+index 50c7d9e..8b199fb 100644
+--- a/arch/arm/cpu/armv7/config.mk
++++ b/arch/arm/cpu/armv7/config.mk
+@@ -37,7 +37,7 @@ PLATFORM_RELFLAGS += $(PF_RELFLAGS_SLB_AT)
+
+ # SEE README.arm-unaligned-accesses
+ PF_NO_UNALIGNED := $(call cc-option, -mno-unaligned-access,)
+-PLATFORM_NO_UNALIGNED := $(PF_NO_UNALIGNED)
++PLATFORM_CPPFLAGS += $(PF_NO_UNALIGNED)
+
+ ifneq ($(CONFIG_IMX_CONFIG),)
+ ifdef CONFIG_SPL
+--
+1.9.1
+
diff --git a/recipes-bsp/u-boot/u-boot-congatec/0001-kernel-add-support-for-gcc5.patch b/recipes-bsp/u-boot/u-boot-congatec/0001-kernel-add-support-for-gcc5.patch
new file mode 100644
index 0000000..89ea7e5
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-congatec/0001-kernel-add-support-for-gcc5.patch
@@ -0,0 +1,85 @@
+From 2141a23b83ee1ee0422d950b47caffc2cba91fa3 Mon Sep 17 00:00:00 2001
+From: Alex de Cabo <alejandro.de-cabo-garcia at congatec.com>
+Date: Mon, 30 Nov 2015 10:06:48 +0100
+Subject: [PATCH 1/4] kernel: add support for gcc5
+
+Since gcc5.2 is used this fixes a build error
+---
+ include/linux/compiler-gcc5.h | 65 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 65 insertions(+)
+ create mode 100644 include/linux/compiler-gcc5.h
+
+diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
+new file mode 100644
+index 0000000..c8c5659
+--- /dev/null
++++ b/include/linux/compiler-gcc5.h
+@@ -0,0 +1,65 @@
++#ifndef __LINUX_COMPILER_H
++#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
++#endif
++
++#define __used __attribute__((__used__))
++#define __must_check __attribute__((warn_unused_result))
++#define __compiler_offsetof(a, b) __builtin_offsetof(a, b)
++
++/* Mark functions as cold. gcc will assume any path leading to a call
++ to them will be unlikely. This means a lot of manual unlikely()s
++ are unnecessary now for any paths leading to the usual suspects
++ like BUG(), printk(), panic() etc. [but let's keep them for now for
++ older compilers]
++
++ Early snapshots of gcc 4.3 don't support this and we can't detect this
++ in the preprocessor, but we can live with this because they're unreleased.
++ Maketime probing would be overkill here.
++
++ gcc also has a __attribute__((__hot__)) to move hot functions into
++ a special section, but I don't see any sense in this right now in
++ the kernel context */
++#define __cold __attribute__((__cold__))
++
++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
++
++#ifndef __CHECKER__
++# define __compiletime_warning(message) __attribute__((warning(message)))
++# define __compiletime_error(message) __attribute__((error(message)))
++#endif /* __CHECKER__ */
++
++/*
++ * Mark a position in code as unreachable. This can be used to
++ * suppress control flow warnings after asm blocks that transfer
++ * control elsewhere.
++ *
++ * Early snapshots of gcc 4.5 don't support this and we can't detect
++ * this in the preprocessor, but we can live with this because they're
++ * unreleased. Really, we need to have autoconf for the kernel.
++ */
++#define unreachable() __builtin_unreachable()
++
++/* Mark a function definition as prohibited from being cloned. */
++#define __noclone __attribute__((__noclone__))
++
++/*
++ * Tell the optimizer that something else uses this function or variable.
++ */
++#define __visible __attribute__((externally_visible))
++
++/*
++ * GCC 'asm goto' miscompiles certain code sequences:
++ *
++ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
++ *
++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
++ *
++ * (asm goto is automatically volatile - the naming reflects this.)
++ */
++#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
++
++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
++#define __HAVE_BUILTIN_BSWAP32__
++#define __HAVE_BUILTIN_BSWAP64__
++#define __HAVE_BUILTIN_BSWAP16__
++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
+--
+1.9.1
+
diff --git a/recipes-bsp/u-boot/u-boot-congatec/0002-common-main.c-make-show_boot_progress-__weak.patch b/recipes-bsp/u-boot/u-boot-congatec/0002-common-main.c-make-show_boot_progress-__weak.patch
new file mode 100644
index 0000000..2361e9b
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-congatec/0002-common-main.c-make-show_boot_progress-__weak.patch
@@ -0,0 +1,31 @@
+From 805fdaceffb43714ae0a9c8ce330f2179599b2ad Mon Sep 17 00:00:00 2001
+From: Alex de Cabo <alejandro.de-cabo-garcia at congatec.com>
+Date: Mon, 30 Nov 2015 10:08:36 +0100
+Subject: [PATCH 2/4] common: main.c: make show_boot_progress __weak
+
+This not only looks a bit better it also prevents a
+warning with W=1 (no previous prototype).
+
+Signed-off-by: Jeroen Hofstee <jeroen at myspectrum.nl>
+Acked-by: Simon Glass <sjg at chromium.org>
+---
+ common/main.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/common/main.c b/common/main.c
+index 145ded1..b5c9bb0 100644
+--- a/common/main.c
++++ b/common/main.c
+@@ -62,8 +62,7 @@ DECLARE_GLOBAL_DATA_PTR;
+ /*
+ * Board-specific Platform code can reimplement show_boot_progress () if needed
+ */
+-void inline __show_boot_progress (int val) {}
+-void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
++__weak void show_boot_progress(int val) {}
+
+ #if defined(CONFIG_UPDATE_TFTP)
+ int update_tftp (ulong addr);
+--
+1.9.1
+
diff --git a/recipes-bsp/u-boot/u-boot-congatec/0003-board-use-__weak.patch b/recipes-bsp/u-boot/u-boot-congatec/0003-board-use-__weak.patch
new file mode 100644
index 0000000..de99632
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-congatec/0003-board-use-__weak.patch
@@ -0,0 +1,121 @@
+From 5fbea3021f483c7e51e5f76a2b967b95034da5f0 Mon Sep 17 00:00:00 2001
+From: Alex de Cabo <alejandro.de-cabo-garcia at congatec.com>
+Date: Mon, 30 Nov 2015 10:11:25 +0100
+Subject: [PATCH 3/4] board: use __weak
+
+---
+ arch/arm/lib/board.c | 18 +++++++++---------
+ common/board_f.c | 9 ++-------
+ common/board_r.c | 10 ++--------
+ 3 files changed, 13 insertions(+), 24 deletions(-)
+
+diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
+index 51b8628..9a02a9c 100644
+--- a/arch/arm/lib/board.c
++++ b/arch/arm/lib/board.c
+@@ -82,24 +82,24 @@ extern void dataflash_print_info(void);
+ ************************************************************************
+ * May be supplied by boards if desired
+ */
+-inline void __coloured_LED_init(void) {}
++void __coloured_LED_init(void) {}
+ void coloured_LED_init(void)
+ __attribute__((weak, alias("__coloured_LED_init")));
+-inline void __red_led_on(void) {}
++void __red_led_on(void) {}
+ void red_led_on(void) __attribute__((weak, alias("__red_led_on")));
+-inline void __red_led_off(void) {}
++void __red_led_off(void) {}
+ void red_led_off(void) __attribute__((weak, alias("__red_led_off")));
+-inline void __green_led_on(void) {}
++void __green_led_on(void) {}
+ void green_led_on(void) __attribute__((weak, alias("__green_led_on")));
+-inline void __green_led_off(void) {}
++void __green_led_off(void) {}
+ void green_led_off(void) __attribute__((weak, alias("__green_led_off")));
+-inline void __yellow_led_on(void) {}
++void __yellow_led_on(void) {}
+ void yellow_led_on(void) __attribute__((weak, alias("__yellow_led_on")));
+-inline void __yellow_led_off(void) {}
++void __yellow_led_off(void) {}
+ void yellow_led_off(void) __attribute__((weak, alias("__yellow_led_off")));
+-inline void __blue_led_on(void) {}
++void __blue_led_on(void) {}
+ void blue_led_on(void) __attribute__((weak, alias("__blue_led_on")));
+-inline void __blue_led_off(void) {}
++void __blue_led_off(void) {}
+ void blue_led_off(void) __attribute__((weak, alias("__blue_led_off")));
+
+ /*
+diff --git a/common/board_f.c b/common/board_f.c
+index 00ca811..49053e0 100644
+--- a/common/board_f.c
++++ b/common/board_f.c
+@@ -139,14 +139,11 @@ int init_func_watchdog_reset(void)
+ }
+ #endif /* CONFIG_WATCHDOG */
+
+-void __board_add_ram_info(int use_default)
++_weak __board_add_ram_info(int use_default)
+ {
+ /* please define platform specific board_add_ram_info() */
+ }
+
+-void board_add_ram_info(int)
+- __attribute__ ((weak, alias("__board_add_ram_info")));
+-
+ static int init_baud_rate(void)
+ {
+ gd->baudrate = getenv_ulong("baudrate", 10, CONFIG_BAUDRATE);
+@@ -241,7 +238,7 @@ ulong get_effective_memsize(void)
+ #endif
+ }
+
+-void __dram_init_banksize(void)
++_weak __dram_init_banksize(void)
+ {
+ #if defined(CONFIG_NR_DRAM_BANKS) && defined(CONFIG_SYS_SDRAM_BASE)
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+@@ -249,8 +246,6 @@ void __dram_init_banksize(void)
+ #endif
+ }
+
+-void dram_init_banksize(void)
+- __attribute__((weak, alias("__dram_init_banksize")));
+
+ #if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
+ static int init_func_i2c(void)
+diff --git a/common/board_r.c b/common/board_r.c
+index 2b17fa6..94bd31e 100644
+--- a/common/board_r.c
++++ b/common/board_r.c
+@@ -72,7 +72,7 @@ DECLARE_GLOBAL_DATA_PTR;
+
+ ulong monitor_flash_len;
+
+-int __board_flash_wp_on(void)
++_weak __board_flash_wp_on(void)
+ {
+ /*
+ * Most flashes can't be detected when write protection is enabled,
+@@ -82,16 +82,10 @@ int __board_flash_wp_on(void)
+ return 0;
+ }
+
+-int board_flash_wp_on(void)
+- __attribute__ ((weak, alias("__board_flash_wp_on")));
+-
+-void __cpu_secondary_init_r(void)
++__weak void cpu_secondary_init_r(void)
+ {
+ }
+
+-void cpu_secondary_init_r(void)
+- __attribute__ ((weak, alias("__cpu_secondary_init_r")));
+-
+ static int initr_secondary_cpu(void)
+ {
+ /*
+--
+1.9.1
+
diff --git a/recipes-bsp/u-boot/u-boot-congatec/0004-inline-use-the-gcc-inline-version-instead-of-the-c99.patch b/recipes-bsp/u-boot/u-boot-congatec/0004-inline-use-the-gcc-inline-version-instead-of-the-c99.patch
new file mode 100644
index 0000000..933c234
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-congatec/0004-inline-use-the-gcc-inline-version-instead-of-the-c99.patch
@@ -0,0 +1,29 @@
+From 87ce68353951c1ffa0ec1ef62d2604726731f0c7 Mon Sep 17 00:00:00 2001
+From: Alex de Cabo <alejandro.de-cabo-garcia at congatec.com>
+Date: Mon, 30 Nov 2015 10:14:02 +0100
+Subject: [PATCH 4/4] inline: use the gcc inline version instead of the c99 one
+
+---
+ include/linux/compiler-gcc.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
+index 73dcf80..562e3a2 100644
+--- a/include/linux/compiler-gcc.h
++++ b/include/linux/compiler-gcc.h
+@@ -44,9 +44,9 @@
+ */
+ #if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \
+ !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4)
+-# define inline inline __attribute__((always_inline))
+-# define __inline__ __inline__ __attribute__((always_inline))
+-# define __inline __inline __attribute__((always_inline))
++# define inline inline __attribute__((always_inline)) __attribute__((__gnu_inline__))
++# define __inline__ __inline__ __attribute__((always_inline)) __attribute__((__gnu_inline__))
++# define __inline __inline __attribute__((always_inline)) __attribute__((__gnu_inline__))
+ #endif
+
+ #define __deprecated __attribute__((deprecated))
+--
+1.9.1
+
diff --git a/recipes-bsp/u-boot/u-boot-congatec/build-Fix-out-of-tree-build.patch b/recipes-bsp/u-boot/u-boot-congatec/build-Fix-out-of-tree-build.patch
new file mode 100644
index 0000000..ea16a08
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-congatec/build-Fix-out-of-tree-build.patch
@@ -0,0 +1,39 @@
+From dbc95624603467b1a963475aaa980cb2347d4871 Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio at ossystems.com.br>
+Date: Fri, 10 Apr 2015 11:49:54 -0300
+Subject: [PATCH] build: Fix out of tree build
+Organization: O.S. Systems Software LTDA.
+
+Upstream-Status: Pending
+
+Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
+---
+ Makefile | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2b963c2..7eb9dae 100644
+--- a/Makefile
++++ b/Makefile
+@@ -464,7 +464,8 @@ $(obj)u-boot.img: $(obj)u-boot.bin
+ -d $< $@
+
+ $(obj)u-boot.pn$(CONFIG_QMX6_PN).imx: $(obj)u-boot.bin
+- $(CC) -E -x c $(CONFIG_IMX_CONFIG) -I./include -o $(obj)imxcfg.imx
++ $(CC) -E -x c $(CONFIG_IMX_CONFIG) -I$(TOPDIR)/arch/$(ARCH)/include \
++ -I$(TOPDIR)/include -I$(obj)include -o $(obj)imxcfg.imx
+ $(obj)tools/mkimage -n $(obj)imxcfg.imx -T imximage \
+ -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
+
+@@ -778,7 +779,7 @@ unconfig:
+
+ %_config:: unconfig
+ @$(MKCONFIG) -A $(@:_config=)
+- @sed -n 's/^#define CONFIG_QMX6_PN[ \t]/ pn/p' $(obj)include/config.h > localversion-qmx6-pn
++ @sed -n 's/^#define CONFIG_QMX6_PN[ \t]/ pn/p' $(obj)include/config.h > $(obj)localversion-qmx6-pn
+
+
+ sinclude $(obj).boards.depend
+--
+2.1.4
+
diff --git a/recipes-bsp/u-boot/u-boot-congatec/u-boot-congatec-Change-environment-mmcroot-variable.patch b/recipes-bsp/u-boot/u-boot-congatec/u-boot-congatec-Change-environment-mmcroot-variable.patch
new file mode 100644
index 0000000..31c94a0
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-congatec/u-boot-congatec-Change-environment-mmcroot-variable.patch
@@ -0,0 +1,29 @@
+From b457fdd8a0a299b13659b3e1e89aa0ffc9c5d9d4 Mon Sep 17 00:00:00 2001
+From: Alex de Cabo <alejandro.de-cabo-garcia at congatec.com>
+Date: Thu, 4 Dec 2014 09:55:29 +0100
+Subject: [PATCH] u-boot-congatec: Change environment mmcroot variable
+
+Since Yocto 1.8 include new GPU drivers which require
+3.10.31 kernel this patch modifies the variable mmcroot
+due to on the new kernel version the naming of SD devices
+changes.
+---
+ include/configs/cgt_qmx6.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/configs/cgt_qmx6.h b/include/configs/cgt_qmx6.h
+index e636ce7..547dc7a 100644
+--- a/include/configs/cgt_qmx6.h
++++ b/include/configs/cgt_qmx6.h
+@@ -20,7 +20,7 @@
+ #define CONFIG_MACH_TYPE 4122
+ #define CONFIG_MXC_UART_BASE UART2_BASE
+ #define CONFIG_CONSOLE_DEV "ttymxc1"
+-#define CONFIG_MMCROOT "/dev/mmcblk0p2"
++#define CONFIG_MMCROOT "/dev/mmcblk1p2"
+ #define CONFIG_BOOTFS "fat"
+
+ #include "cgt_qmx6_common.h"
+--
+1.9.1
+
diff --git a/recipes-bsp/u-boot/u-boot-congatec/u-boot-congatec-Change_environment_variables.patch b/recipes-bsp/u-boot/u-boot-congatec/u-boot-congatec-Change_environment_variables.patch
new file mode 100644
index 0000000..b93acf7
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-congatec/u-boot-congatec-Change_environment_variables.patch
@@ -0,0 +1,46 @@
+From 6a87d9cc6bed6956683f7e6305b337a29502b147 Mon Sep 17 00:00:00 2001
+From: Alex de Cabo <alejandro.de-cabo-garcia at congatec.com>
+Date: Tue, 23 Sep 2014 15:17:56 +0200
+Subject: [PATCH] u-boot-congatec: Change environment variables
+
+Changes the loadfdt, loaduimage and mmcroot variables to be
+Yocto community standard compatible
+---
+ include/configs/cgt_qmx6.h | 4 ++--
+ include/configs/cgt_qmx6_common.h | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/configs/cgt_qmx6.h b/include/configs/cgt_qmx6.h
+index c3278e5..e636ce7 100644
+--- a/include/configs/cgt_qmx6.h
++++ b/include/configs/cgt_qmx6.h
+@@ -20,8 +20,8 @@
+ #define CONFIG_MACH_TYPE 4122
+ #define CONFIG_MXC_UART_BASE UART2_BASE
+ #define CONFIG_CONSOLE_DEV "ttymxc1"
+-#define CONFIG_MMCROOT "/dev/mmcblk0p1"
+-#define CONFIG_BOOTFS "ext2"
++#define CONFIG_MMCROOT "/dev/mmcblk0p2"
++#define CONFIG_BOOTFS "fat"
+
+ #include "cgt_qmx6_common.h"
+ #include <asm/arch/imx-regs.h>
+diff --git a/include/configs/cgt_qmx6_common.h b/include/configs/cgt_qmx6_common.h
+index 31a7b7e..b234e46 100644
+--- a/include/configs/cgt_qmx6_common.h
++++ b/include/configs/cgt_qmx6_common.h
+@@ -170,9 +170,9 @@
+ "bootscript=echo Running bootscript from mmc ...; " \
+ "source\0" \
+ "loaduimage=" \
+- CONFIG_BOOTFS "load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${uimage}\0" \
++ CONFIG_BOOTFS "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
+ "loadfdt=" \
+- CONFIG_BOOTFS "load mmc ${mmcdev}:${mmcpart} ${fdt_addr} boot/${fdt_file}\0" \
++ CONFIG_BOOTFS "load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+ "mmcboot=echo Booting from mmc ...; " \
+ "run mmcargs; " \
+ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+--
+1.9.1
+
diff --git a/recipes-bsp/u-boot/u-boot-congatec_2013.04.bb b/recipes-bsp/u-boot/u-boot-congatec_2013.04.bb
new file mode 100644
index 0000000..b75cff4
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-congatec_2013.04.bb
@@ -0,0 +1,32 @@
+# Congatec QMX6 u-boot
+
+require recipes-bsp/u-boot/u-boot.inc
+
+DESCRIPTION = "u-boot which includes support for Congatec Boards."
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
+
+
+PROVIDES += "u-boot"
+
+PV = "2013.04"
+
+SRCREV = "29ea3cb07a9ea11ee7c64a3735ca92b679ddd38b"
+SRCBRANCH = "cgt_imx_v2013.04_3.10.17_1.0.2"
+
+SRC_URI = "git://git.congatec.com/arm/qmx6_uboot.git;protocol=http;branch=${SRCBRANCH} \
+ file://u-boot-congatec-Change_environment_variables.patch \
+ file://u-boot-congatec-Change-environment-mmcroot-variable.patch \
+ file://build-Fix-out-of-tree-build.patch \
+ file://0001-kernel-add-support-for-gcc5.patch \
+ file://0002-common-main.c-make-show_boot_progress-__weak.patch \
+ file://0003-board-use-__weak.patch \
+ file://0004-inline-use-the-gcc-inline-version-instead-of-the-c99.patch \
+ file://0001-armv7-config.patch \
+"
+
+S = "${WORKDIR}/git"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(cgtqmx6)"
+
--
1.9.1
More information about the meta-freescale
mailing list