mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 05:36:47 +00:00
u-boot (NXP iMX8): rebase patches for 2022.04
This commit is contained in:
parent
8ee96c8a24
commit
35685d6d71
@ -12,7 +12,7 @@ diff --git a/configs/pico-imx8mq_defconfig b/configs/pico-imx8mq_defconfig
|
||||
index e2e3a15da1..d70d7fc1cc 100644
|
||||
--- a/configs/pico-imx8mq_defconfig
|
||||
+++ b/configs/pico-imx8mq_defconfig
|
||||
@@ -57,3 +57,4 @@ CONFIG_DM_REGULATOR_GPIO=y
|
||||
@@ -83,3 +83,4 @@ CONFIG_DM_REGULATOR_GPIO=y
|
||||
CONFIG_DM_RESET=y
|
||||
CONFIG_MXC_UART=y
|
||||
CONFIG_DM_THERMAL=y
|
||||
@ -21,8 +21,8 @@ diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
|
||||
index 7a5891652f..e301bc736d 100644
|
||||
--- a/include/configs/pico-imx8mq.h
|
||||
+++ b/include/configs/pico-imx8mq.h
|
||||
@@ -71,54 +71,22 @@
|
||||
#define CONFIG_PHY_ATHEROS
|
||||
@@ -41,42 +41,22 @@
|
||||
#define IMX_FEC_BASE 0x30BE0000
|
||||
#endif
|
||||
|
||||
-/* Initial environment variables */
|
||||
@ -36,7 +36,7 @@ index 7a5891652f..e301bc736d 100644
|
||||
- "initrd_addr=0x43800000\0" \
|
||||
- "initrd_high=0xffffffffffffffff\0" \
|
||||
- "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
|
||||
- "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
|
||||
- "mmcpart=1\0" \
|
||||
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
|
||||
- "mmcautodetect=yes\0" \
|
||||
- "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
|
||||
@ -61,18 +61,6 @@ index 7a5891652f..e301bc736d 100644
|
||||
- "fi; " \
|
||||
- "${get_cmd} ${loadaddr} ${image}; " \
|
||||
- "booti; "
|
||||
-
|
||||
-#define CONFIG_BOOTCOMMAND \
|
||||
- "mmc dev ${mmcdev}; if mmc rescan; then " \
|
||||
- "if run loadbootscript; then " \
|
||||
- "run bootscript; " \
|
||||
- "else " \
|
||||
- "if run loadimage; then " \
|
||||
- "run mmcboot; " \
|
||||
- "else run netboot; " \
|
||||
- "fi; " \
|
||||
- "fi; " \
|
||||
- "else booti ${loadaddr} - ${fdt_addr}; fi"
|
||||
+#define BOOT_TARGET_DEVICES(func) \
|
||||
+ func(MMC, mmc, 1) \
|
||||
+ func(MMC, mmc, 0) \
|
||||
@ -91,7 +79,7 @@ index 7a5891652f..e301bc736d 100644
|
||||
+ BOOTENV
|
||||
|
||||
/* Link Definitions */
|
||||
#define CONFIG_LOADADDR 0x40480000
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user