mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-23 07:11:26 +00:00
53 lines
2.6 KiB
Diff
53 lines
2.6 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index 07debc4..3d91d1d 100755
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -477,6 +477,9 @@ ifndef CONFIG_SYS_UBOOT_START
|
|
CONFIG_SYS_UBOOT_START := 0
|
|
endif
|
|
|
|
+$(obj)u-boot.mmc: $(obj)u-boot.bin
|
|
+ echo y | $(obj)tools/marvell/doimage -T mmc -D 0x0 -E 0x0 -G $(obj)tools/marvell/bin_hdr/bin_hdr.bin u-boot.bin u-boot.mmc
|
|
+
|
|
$(obj)u-boot.img: $(obj)u-boot.bin
|
|
$(obj)tools/mkimage -A $(ARCH) -T firmware -C none \
|
|
-O u-boot -a $(CONFIG_SYS_TEXT_BASE) \
|
|
diff --git a/boards.cfg b/boards.cfg
|
|
index 7e8d713..4d9f810 100644
|
|
--- a/boards.cfg
|
|
+++ b/boards.cfg
|
|
@@ -55,7 +55,7 @@ armada_38x arm armv7 a38x mv_ebu
|
|
armada_38x_customer0 arm armv7 a38x mv_ebu mvca9 armada_38x:CUSTOMER_BOARD_0,ARMADA_38X
|
|
armada_38x_customer1 arm armv7 a38x mv_ebu mvca9 armada_38x:CUSTOMER_BOARD_1,ARMADA_38X
|
|
armada_38x_clearfog arm armv7 a38x mv_ebu mvca9 armada_38x:CLEARFOG_BOARD,ARMADA_38X
|
|
-armada_38x_helios4 arm armv7 a38x mv_ebu mvca9 armada_38x:HELIOS4_BOARD,ARMADA_38X
|
|
+armada_38x_helios4 arm armv7 a38x mv_ebu mvca9 armada_38x:HELIOS4_BOARD,ARMADA_38X,MV_MMC_BOOT,MV_INCLUDE_SPI,DDR3
|
|
armada_39x arm armv7 a38x mv_ebu mvca9 armada_38x:ARMADA_39X
|
|
armada_39x_customer0 arm armv7 a38x mv_ebu mvca9 armada_38x:CUSTOMER_BOARD_0,ARMADA_39X
|
|
armada_39x_customer1 arm armv7 a38x mv_ebu mvca9 armada_38x:CUSTOMER_BOARD_1,ARMADA_39X
|
|
diff --git a/include/configs/armada_38x.h b/include/configs/armada_38x.h
|
|
index 1ae5256..23d681d 100644
|
|
--- a/include/configs/armada_38x.h
|
|
+++ b/include/configs/armada_38x.h
|
|
@@ -286,6 +286,10 @@ extern unsigned int mvUartPortGet(void);
|
|
|
|
/* SPI Flash configuration */
|
|
/*****************************/
|
|
+#if defined(CONFIG_MV_INCLUDE_SPI)
|
|
+ #define MV_INCLUDE_SPI
|
|
+#endif
|
|
+
|
|
#if defined(MV_INCLUDE_SPI)
|
|
#define CONFIG_CMD_SPI
|
|
#define CONFIG_CMD_SF
|
|
@@ -563,6 +567,10 @@ extern int nand_get_env_offs(void);
|
|
/*****************************/
|
|
//#define CONFIG_MMC_TRACE
|
|
/* Boot from MMC settings */
|
|
+#if defined(CONFIG_MV_MMC_BOOT)
|
|
+ #define MV_MMC_BOOT
|
|
+#endif
|
|
+
|
|
#if defined(MV_MMC_BOOT)
|
|
/* the following commands are supported only with SPI/NAND interfaces */
|
|
#if (!defined(MV_INCLUDE_SPI) && !defined(MV_NAND))
|