diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-01 09:39:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-01 09:39:38 -0400 |
| commit | 4da84d1b9b14f5ad8f86f0c69c85ac3d1f54cfd2 (patch) | |
| tree | 41295a1f3ada0bd66f7217777e3b262fb2932342 /include/configs | |
| parent | 48cf0d8c6d261f543bff12046a366ec3b832937d (diff) | |
| parent | 00102ae52055e294ac37ae1380f37620f4a8bb26 (diff) | |
Merge tag 'u-boot-imx-20190401' of git://git.denx.de/u-boot-imx
Fixes for 2019.01
- pico-imx6ul: fix after conversion
- engicam boards
- pico-imx7d _ README due to hang with imx-usb-loader
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/imx6_logic.h | 10 | ||||
| -rw-r--r-- | include/configs/tbs2910.h | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index a121064e37..ad45b106b0 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -23,7 +23,7 @@ /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 2 -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* Dev kit SD card */ + /* Ethernet Configs */ #define CONFIG_FEC_XCV_TYPE RMII @@ -43,10 +43,10 @@ "console=" CONSOLE_DEV "\0" \ "mmcdev=1\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \ "nandroot=ubi0:rootfs rootfstype=ubifs\0" \ "mmcargs=setenv bootargs console=${console},${baudrate}" \ - " root=${mmcroot} ${mtdparts}\0" \ + " root=PARTUUID=${uuid} rootwait rw\0 ${mtdparts}\0" \ "nandargs=setenv bootargs console=${console},${baudrate}" \ " ubi.mtd=fs root=${nandroot} ${mtdparts}\0" \ "ramargs=setenv bootargs console=${console},${baudrate}" \ @@ -60,8 +60,8 @@ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdt_file}\0" \ "loadramdisk=fatload mmc ${mmcdev}:${mmcpart} ${ramdisk_addr_r}" \ " ${ramdisk_file}; setenv ramdisksize ${filesize}\0" \ - "mmcboot=echo Booting from mmc...; run mmcargs; run loadimage;" \ - " run loadfdt; bootz ${loadaddr} - ${fdt_addr_r}\0" \ + "mmcboot=echo Booting from mmc...; run finduuid; run mmcargs;" \ + "run loadimage; run loadfdt; bootz ${loadaddr} - ${fdt_addr_r}\0" \ "mmcramboot=run ramargs; run loadimage;" \ " run loadfdt; run loadramdisk;" \ " bootz ${loadaddr} ${ramdisk_addr_r} ${fdt_addr_r}\0" \ diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 2d4b9c9bfe..b06c90939c 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -94,7 +94,7 @@ "run set_con_hdmi; " \ "else " \ "run set_con_serial; " \ - "fi;" + "fi" #endif /* CONFIG_USB_KEYBOARD */ #endif /* CONFIG_CMD_USB */ @@ -142,12 +142,12 @@ "console=ttymxc0\0" \ "fan=gpio set 92\0" \ "set_con_serial=setenv stdout serial; " \ - "setenv stderr serial;\0" \ + "setenv stderr serial\0" \ "set_con_hdmi=setenv stdout serial,vga; " \ - "setenv stderr serial,vga;\0" \ - "stderr=serial,vga;\0" \ - "stdin=serial,usbkbd;\0" \ - "stdout=serial,vga;\0" + "setenv stderr serial,vga\0" \ + "stderr=serial,vga\0" \ + "stdin=serial,usbkbd\0" \ + "stdout=serial,vga\0" #define CONFIG_BOOTCOMMAND \ "mmc rescan; " \ |