mirror of
https://github.com/Freescale/meta-freescale-3rdparty.git
synced 2025-07-19 12:09:01 +02:00
cgtqmx6: Convert to use u-boot-fslc
The u-boot-fslc now includes the SPl support for the cgtqmx6 SoM devices avoiding the need of part number setting for build. This patch rework the machine file to use the u-boot-fslc recipe and remove the old u-boot-congatec one, which becomes unused. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
Otavio Salvador
parent
fce42ea3f0
commit
3c143594dd
|
|
@ -9,42 +9,15 @@ include conf/machine/include/tune-cortexa9.inc
|
|||
|
||||
SOC_FAMILY = "mx6:mx6dl:mx6q"
|
||||
|
||||
# Use u-boot QMX6
|
||||
PREFERRED_PROVIDER_u-boot = "u-boot-congatec"
|
||||
|
||||
UBOOT_CONFIG ??= " \
|
||||
pn016100 \
|
||||
pn016101 \
|
||||
pn016102 \
|
||||
pn016103 \
|
||||
pn016104 \
|
||||
pn016105 \
|
||||
pn016106 \
|
||||
pn016110 \
|
||||
pn016111 \
|
||||
pn016112 \
|
||||
pn016113 \
|
||||
"
|
||||
|
||||
UBOOT_CONFIG[pn016100] = "cgt_qmx6_pn016100"
|
||||
UBOOT_CONFIG[pn016101] = "cgt_qmx6_pn016101"
|
||||
UBOOT_CONFIG[pn016102] = "cgt_qmx6_pn016102"
|
||||
UBOOT_CONFIG[pn016103] = "cgt_qmx6_pn016103"
|
||||
UBOOT_CONFIG[pn016104] = "cgt_qmx6_pn016104"
|
||||
UBOOT_CONFIG[pn016105] = "cgt_qmx6_pn016105"
|
||||
UBOOT_CONFIG[pn016106] = "cgt_qmx6_pn016106"
|
||||
UBOOT_CONFIG[pn016110] = "cgt_qmx6_pn016110"
|
||||
UBOOT_CONFIG[pn016111] = "cgt_qmx6_pn016111"
|
||||
UBOOT_CONFIG[pn016112] = "cgt_qmx6_pn016112"
|
||||
UBOOT_CONFIG[pn016113] = "cgt_qmx6_pn016113"
|
||||
|
||||
UBOOT_MAKE_TARGET = ""
|
||||
UBOOT_BINARY = "u-boot.${type}.imx"
|
||||
UBOOT_SUFFIX = "img"
|
||||
SPL_BINARY = "SPL"
|
||||
UBOOT_MACHINE = "cgtqmx6eval_defconfig"
|
||||
|
||||
# Use linux kernel QMX6
|
||||
PREFERRED_PROVIDER_virtual/kernel ??= "linux-congatec"
|
||||
KERNEL_DEVICETREE = "imx6q-qmx6.dtb imx6dl-qmx6.dtb"
|
||||
KERNEL_IMAGETYPE = "uImage"
|
||||
KERNEL_IMAGETYPE = "zImage"
|
||||
|
||||
SERIAL_CONSOLE = "115200 ttymxc1"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
From dbc95624603467b1a963475aaa980cb2347d4871 Mon Sep 17 00:00:00 2001
|
||||
From: Otavio Salvador <otavio@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@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
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From b457fdd8a0a299b13659b3e1e89aa0ffc9c5d9d4 Mon Sep 17 00:00:00 2001
|
||||
From: Alex de Cabo <alejandro.de-cabo-garcia@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
|
||||
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
From 6a87d9cc6bed6956683f7e6305b337a29502b147 Mon Sep 17 00:00:00 2001
|
||||
From: Alex de Cabo <alejandro.de-cabo-garcia@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
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
# 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 = "da45c17308845960330a5f24c77cbe86e1bb3177"
|
||||
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 \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
COMPATIBLE_MACHINE = "(cgtqmx6)"
|
||||
Loading…
Reference in New Issue
Block a user