mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-29 10:11:23 +00:00
69 lines
2.6 KiB
Diff
69 lines
2.6 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index 9fd8afe..a867c8d 100755
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -485,6 +485,9 @@ $(obj)u-boot.sata: $(obj)u-boot.bin
|
|
echo y | $(obj)tools/marvell/doimage -T sata -D 0x0 -E 0x0 -G $(obj)tools/marvell/bin_hdr/bin_hdr.bin u-boot.bin u-boot.sata
|
|
echo y | $(obj)tools/marvell/doimage -T uart -D 0x0 -E 0x0 -G $(obj)tools/marvell/bin_hdr/bin_hdr.uart.bin u-boot.bin u-boot-uart.sata
|
|
|
|
+$(obj)u-boot.flash: $(obj)u-boot.bin
|
|
+ echo y | $(obj)tools/marvell/doimage -T flash -D 0x0 -E 0x0 -G $(obj)tools/marvell/bin_hdr/bin_hdr.bin u-boot.bin u-boot.flash
|
|
+ echo y | $(obj)tools/marvell/doimage -T uart -D 0x0 -E 0x0 -G $(obj)tools/marvell/bin_hdr/bin_hdr.uart.bin u-boot.bin u-boot-uart.flash
|
|
|
|
$(obj)u-boot.img: $(obj)u-boot.bin
|
|
$(obj)tools/mkimage -A $(ARCH) -T firmware -C none \
|
|
diff --git a/board/mv_ebu/common/USP/cmd_bubt.c b/board/mv_ebu/common/USP/cmd_bubt.c
|
|
index 19d5155..aad528d 100755
|
|
--- a/board/mv_ebu/common/USP/cmd_bubt.c
|
|
+++ b/board/mv_ebu/common/USP/cmd_bubt.c
|
|
@@ -381,7 +381,7 @@ int spi_burn_uboot_cmd(cmd_tbl_t *cmdtp, int flag, int loadfrom, int argc, char
|
|
#endif
|
|
|
|
|
|
-#if defined(MV_NOR_BOOT) || (MV_INCLUDE_NOR)
|
|
+#if defined(MV_NOR_BOOT) || defined(MV_INCLUDE_NOR)
|
|
|
|
/* Boot from Nor flash */
|
|
int nor_burn_uboot_cmd(cmd_tbl_t *cmdtp, int flag, int loadfrom, int argc, char * const argv[])
|
|
diff --git a/include/configs/armada_38x.h b/include/configs/armada_38x.h
|
|
index 75b8bf5..c71d022 100644
|
|
--- a/include/configs/armada_38x.h
|
|
+++ b/include/configs/armada_38x.h
|
|
@@ -404,6 +404,22 @@ extern int nand_get_env_offs(void);
|
|
#define MV_NBOOT_LEN (4 << 10) /* Reserved 4KB for boot strap */
|
|
#endif /* MV_NAND_BOOT */
|
|
#endif /* MV_NAND */
|
|
+
|
|
+#if defined(CONFIG_MV_SATA_BOOT)
|
|
+#define MV_SATA_BOOT
|
|
+#endif
|
|
+
|
|
+#if defined(MV_SATA_BOOT)
|
|
+ #define CONFIG_ENV_IS_IN_MMC
|
|
+ #define CONFIG_SYS_MMC_ENV_DEV 0
|
|
+ #define CONFIG_ENV_SECT_SIZE 0x200
|
|
+ #define CONFIG_ENV_SIZE 0x10000
|
|
+ #define CONFIG_ENV_OFFSET 0xf0000
|
|
+ #define CONFIG_ENV_ADDR CONFIG_ENV_OFFSET
|
|
+ #define MONITOR_HEADER_LEN 0x200
|
|
+ #define CONFIG_SYS_MONITOR_BASE 0
|
|
+ #define CONFIG_SYS_MONITOR_LEN 0x80000 /*(512 << 10) Reserve 512 kB for Monitor */
|
|
+#endif
|
|
/*
|
|
* Board init
|
|
*/
|
|
@@ -666,6 +682,14 @@ extern int nand_get_env_offs(void);
|
|
#define CONFIG_ENV_RANGE_NOR CONFIG_ENV_SIZE_NOR * 8
|
|
#define CONFIG_ENV_ADDR_NOR (NOR_CS_BASE + CONFIG_ENV_OFFSET_NOR)
|
|
|
|
+#if defined(CONFIG_MV_NOR_BOOT)
|
|
+#define MV_NOR_BOOT
|
|
+#endif
|
|
+
|
|
+#if defined(CONFIG_MV_INCLUDE_NOR)
|
|
+#define MV_INCLUDE_NOR
|
|
+#endif
|
|
+
|
|
#if defined(MV_INCLUDE_NOR)
|
|
|
|
#define CONFIG_NOR_FLASH_AUTODETECT
|