diff options
| -rw-r--r-- | package/u-boot/Makefile | 4 | ||||
| -rw-r--r-- | package/u-boot/patches/patch-arch_arm_lib_bootm_c | 13 |
2 files changed, 4 insertions, 13 deletions
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index e704f1c0b..5d92f78ff 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -27,6 +27,7 @@ $(eval $(call PKG_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP UBOOT:= u-boot.bin ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) CONFIG:= mx6cuboxi_defconfig +UBOOT:= u-boot.img endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) CONFIG:= rpi_defconfig @@ -83,6 +84,9 @@ u-boot-install: ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) $(INSTALL_BIN) ./files/boot.script.bpi $(FW_DIR) endif +ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) + $(INSTALL_BIN) $(WRKBUILD)/SPL $(FW_DIR) +endif include $(ADK_TOPDIR)/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/u-boot/patches/patch-arch_arm_lib_bootm_c b/package/u-boot/patches/patch-arch_arm_lib_bootm_c deleted file mode 100644 index dab77668b..000000000 --- a/package/u-boot/patches/patch-arch_arm_lib_bootm_c +++ /dev/null @@ -1,13 +0,0 @@ ---- u-boot-2015.07.orig/arch/arm/lib/bootm.c 2015-07-14 19:32:21.000000000 +0200 -+++ u-boot-2015.07/arch/arm/lib/bootm.c 2015-07-27 13:51:04.000000000 +0200 -@@ -71,8 +71,8 @@ void arch_lmb_reserve(struct lmb *lmb) - */ - static void announce_and_cleanup(int fake) - { -- printf("\nStarting kernel ...%s\n\n", fake ? -- "(fake run for tracing)" : ""); -+ //printf("\nStarting kernel ...%s\n\n", fake ? -+ // "(fake run for tracing)" : ""); - bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel"); - #ifdef CONFIG_BOOTSTAGE_FDT - bootstage_fdt_add_report(); |