brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

Fixes for 2019.01

Browse Source 
- pico-imx6ul: fix after conversion
 	- engicam boards
 	- pico-imx7d _ README due to hang with imx-usb-loader
 -----BEGIN PGP SIGNATURE-----
 
 iQHDBAABCgAtFiEEiZClFGvhzbUNsmAvKMTY0yrV63cFAlyhyjAPHHNiYWJpY0Bk
 ZW54LmRlAAoJECjE2NMq1et3LD4MAMCkfd9IyPhy+TWXCatCmoLhD5+0MmhvxU4z
 gHrmO0n/rHL3mqJ0ya4RgmN/mTPa+0nFZ2yarTxD8Yhm9T9R/IIhLC7MxvNeojbC
 oXjMNE4P9TMgvUTEzqbdAp+B9Cy7TdygnCVmUPJuleAvePCxX4kM/UTMiNveUKLo
 xgYqfRxpSR1gef7me+HJEoVA0Bc4VgbbASN04Zw8FyFSXaJz4VUAcxFXZKHiYa8j
 OSjIk8rItHOgmZkTH12QWhqp9wJcD8AJgVNsCgdGxxTJSleAjoojjO9nGeGSHLzJ
 fGiGDlMvh63G8GypjfHAAfTXRLv5GJSkxLIYBolRmao+ELYLEkaU6Y33WX0td50U
 ufjuQCaO/g8UiRRwpqT1138GEkzwKAm9fN0T7c8yDi2CeW2ihugJJySuSgoJg1Nj
 qgf3u4EpgSKdAiUxM5gr58x+cugGUVZ62y0QELrbq5xoJHriMwWzilxHGhAASmfO
 r4YCtfpH4PZXe9nmrh31qHRjcXPxVw==
 =TWtH
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Tom Rini 2019-04-01 09:39:38 -04:00
commit 4da84d1b9b
8 changed files with 53 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
board/technexion/pico-imx6ul/spl.c
View File

@ -10,6 +10,7 @@
#include <asm/gpio.h>
#include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/boot_mode.h>
#include <fsl_esdhc.h>
#include <linux/libfdt.h>
#include <spl.h>
@ -141,4 +142,37 @@ void board_init_f(ulong dummy)
void reset_cpu(ulong addr)
{
}
#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \
PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_LOW | \
PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS)
static iomux_v3_cfg_t const usdhc1_pads[] = {
MX6_PAD_SD1_CLK__USDHC1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
MX6_PAD_SD1_CMD__USDHC1_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
MX6_PAD_SD1_DATA0__USDHC1_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
MX6_PAD_SD1_DATA1__USDHC1_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
MX6_PAD_SD1_DATA2__USDHC1_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
MX6_PAD_SD1_DATA3__USDHC1_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
MX6_PAD_NAND_READY_B__USDHC1_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
MX6_PAD_NAND_CE0_B__USDHC1_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
MX6_PAD_NAND_CE1_B__USDHC1_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
MX6_PAD_NAND_CLE__USDHC1_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
};
static struct fsl_esdhc_cfg usdhc_cfg[1] = {
{USDHC1_BASE_ADDR},
};
int board_mmc_getcd(struct mmc *mmc)
{
return 1;
}
int board_mmc_init(bd_t *bis)
{
imx_iomux_v3_setup_multiple_pads(usdhc1_pads, ARRAY_SIZE(usdhc1_pads));
usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
}
#endif

4
board/technexion/pico-imx7d/README
View File

@ -26,6 +26,10 @@ Connect a USB to serial adapter between the host PC and pico.
Connect a USB cable between the OTG pico port and the host PC.
Note: Some computers may be a bit strict with USB current draw and will
shut down their ports if the draw is too high. The solution for that is
to use an externally powered USB hub between the board and the host computer.
Open a terminal program such as minicom.
Copy SPL and u-boot.img to the imx_usb_loader folder.

1
configs/imx6dl_icore_nand_defconfig
View File

@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_MX6Q_ENGICAM=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL=y

1
configs/imx6q_icore_nand_defconfig
View File

@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_MX6Q_ENGICAM=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL=y

1
configs/imx6q_logic_defconfig
View File

@ -46,6 +46,7 @@ CONFIG_CMD_USB_SDP=y
CONFIG_CMD_USB_MASS_STORAGE=y
CONFIG_CMD_CACHE=y
# CONFIG_CMD_LED is not set
CONFIG_CMD_UUID=y
CONFIG_CMD_PMIC=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_MTDPARTS=y

2
configs/imx6qdl_icore_mmc_defconfig
View File

@ -16,7 +16,7 @@ CONFIG_CMD_BOOTCOUNT=y
CONFIG_BOOTCOUNT_LIMIT=y
CONFIG_BOOTCOUNT_BOOTLIMIT=3
CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
CONFIG_SYS_BOOTCOUNT_ADDR=0x00900000
CONFIG_SYS_BOOTCOUNT_ADDR=0x020D8024
CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041
CONFIG_IMX_WATCHDOG=y
CONFIG_DEBUG_UART=y

10
include/configs/imx6_logic.h
View File

@ -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" \

12
include/configs/tbs2910.h
View File

@ -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; " \