From 1aace42565371ef2dd3e1c29b1930e01f05e3f63 Mon Sep 17 00:00:00 2001 From: vpeter4 Date: Sat, 16 May 2015 17:20:23 +0200 Subject: [PATCH] u-boot: fix compile, update patch for udoo --- packages/tools/u-boot/package.mk | 8 +- projects/imx6/bootloader/uEnv-matrix.txt | 4 + .../u-boot/100-udoo_board_support.patch | 125 +++++++++++++----- 3 files changed, 99 insertions(+), 38 deletions(-) create mode 100644 projects/imx6/bootloader/uEnv-matrix.txt mode change 100644 => 100755 projects/imx6/patches/u-boot/100-udoo_board_support.patch diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk index 53033330dc..14a20e5129 100644 --- a/packages/tools/u-boot/package.mk +++ b/packages/tools/u-boot/package.mk @@ -77,12 +77,12 @@ make_target() { elif [ "$UBOOT_TARGET" = "udoo_quad_config" ]; then TARGET_NAME="udoo_quad" else - TARGET_NAME="undef" + TARGET_NAME="undef" fi - [ -f u-boot.img ] && mv u-boot.img u-boot-$TARGET_NAME.img - [ -f u-boot.imx ] && mv u-boot.imx u-boot-$TARGET_NAME.imx - [ -f SPL ] && mv SPL SPL-$TARGET_NAME + [ -f u-boot.img ] && mv u-boot.img u-boot-$TARGET_NAME.img || : + [ -f u-boot.imx ] && mv u-boot.imx u-boot-$TARGET_NAME.imx || : + [ -f SPL ] && mv SPL SPL-$TARGET_NAME || : fi done } diff --git a/projects/imx6/bootloader/uEnv-matrix.txt b/projects/imx6/bootloader/uEnv-matrix.txt new file mode 100644 index 0000000000..6e60f0b358 --- /dev/null +++ b/projects/imx6/bootloader/uEnv-matrix.txt @@ -0,0 +1,4 @@ +zImage=/KERNEL +bootfile=/KERNEL +mmcargs=setenv bootargs 'boot=/dev/mmcblk0p1 disk=/dev/mmcblk0p2 quiet video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32 dmfc=3 consoleblank=0' +uenvcmd=if test -n $ethaddr; then true; else setenv ethaddr 1E:ED:19:27:1A:B2; fi diff --git a/projects/imx6/patches/u-boot/100-udoo_board_support.patch b/projects/imx6/patches/u-boot/100-udoo_board_support.patch old mode 100644 new mode 100755 index 99e94f7361..dab728f82b --- a/projects/imx6/patches/u-boot/100-udoo_board_support.patch +++ b/projects/imx6/patches/u-boot/100-udoo_board_support.patch @@ -1,40 +1,42 @@ -From b64574fc512206b8bd5ccc8d9acb4dcb21d7b36e Mon Sep 17 00:00:00 2001 +From 6b8791fcb10110cec4c5bdf91babffcdcfc1a04f Mon Sep 17 00:00:00 2001 From: vpeter4 -Date: Sat, 29 Nov 2014 15:17:00 +0100 +Date: Sat, 16 May 2015 16:44:39 +0200 Subject: [PATCH] udoo board support diff between u-boot-2013.10-rc3 - U-Boot_Unico-2013 1b90fd4 29.11.2014 + U-Boot_Unico-2013 799fb9b 15.5.2015 used macro MACH_TYPE_UDOO in cfb_console.c for version_string/BOARD_INFO_STRING +L2 cache support is disabled + got error: ** No partition table - mmc 0 ** make udoo_quad_config make udoo_dl_config - --- - arch/arm/cpu/armv7/cpu.c | 14 + - arch/arm/imx-common/Makefile | 2 + - arch/arm/imx-common/cmd_plotmsg.c | 74 +++ - arch/arm/imx-common/sata.c | 33 ++ - arch/arm/include/asm/imx-common/sata.h | 17 + - board/udoo/1066mhz_4x256mx16_dl.cfg | 58 +++ - board/udoo/1066mhz_4x256mx16_q.cfg | 63 +++ - board/udoo/Makefile | 26 + - board/udoo/clocks.cfg | 31 ++ - board/udoo/ddr-setup_dl.cfg | 85 ++++ - board/udoo/ddr-setup_q.cfg | 87 ++++ - board/udoo/udoo.c | 540 +++++++++++++++++++++ - board/udoo/udoo.cfg | 35 ++ - boards.cfg | 2 + - common/Makefile | 1 + - common/cmd_multiboot.c | 312 ++++++++++++ - drivers/video/cfb_console.c | 13 +- - include/configs/udoo.h | 265 ++++++++++ - include/micrel.h | 5 + - include/video.h | 2 + - 20 files changed, 1664 insertions(+), 1 deletion(-) + arch/arm/cpu/armv7/cpu.c | 14 + + arch/arm/imx-common/Makefile | 2 + + arch/arm/imx-common/cmd_plotmsg.c | 74 + + arch/arm/imx-common/sata.c | 33 + + arch/arm/include/asm/imx-common/sata.h | 17 + + board/boundary/nitrogen6x/nitrogen6x.c | 29 +- + board/udoo/1066mhz_4x256mx16_dl.cfg | 58 + + board/udoo/1066mhz_4x256mx16_q.cfg | 63 + + board/udoo/Makefile | 26 + + board/udoo/clocks.cfg | 31 + + board/udoo/ddr-setup_dl.cfg | 85 ++ + board/udoo/ddr-setup_q.cfg | 87 ++ + board/udoo/udoo.c | 540 ++++++++ + board/udoo/udoo.cfg | 35 + + boards.cfg | 2 + + common/Makefile | 1 + + common/cmd_multiboot.c | 312 +++++ + drivers/video/cfb_console.c | 12 + + include/configs/udoo.h | 268 ++++ + include/micrel.h | 5 + + include/video.h | 2 + + 21 files changed, 5482 insertions(+), 27 deletions(-) create mode 100644 arch/arm/imx-common/cmd_plotmsg.c create mode 100644 arch/arm/imx-common/sata.c create mode 100644 arch/arm/include/asm/imx-common/sata.h @@ -245,6 +247,60 @@ index 0000000..40fbf77 + +#endif + +diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c +index 2b61e5d..0c26bcb 100644 +--- a/board/boundary/nitrogen6x/nitrogen6x.c ++++ b/board/boundary/nitrogen6x/nitrogen6x.c +@@ -2,7 +2,7 @@ + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. + * Copyright (C) 2013, Boundary Devices + * +- * SPDX-License-Identifier: GPL-2.0+ ++ * SPDX-License-Identifier: GPL-2.0+ + */ + + #include +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -378,32 +379,6 @@ static void setup_buttons(void) + ARRAY_SIZE(button_pads)); + } + +-#ifdef CONFIG_CMD_SATA +- +-int setup_sata(void) +-{ +- struct iomuxc_base_regs *const iomuxc_regs +- = (struct iomuxc_base_regs *) IOMUXC_BASE_ADDR; +- int ret = enable_sata_clock(); +- if (ret) +- return ret; +- +- clrsetbits_le32(&iomuxc_regs->gpr[13], +- IOMUXC_GPR13_SATA_MASK, +- IOMUXC_GPR13_SATA_PHY_8_RXEQ_3P0DB +- |IOMUXC_GPR13_SATA_PHY_7_SATA2M +- |IOMUXC_GPR13_SATA_SPEED_3G +- |(3<