mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-30 00:20:44 +09:00
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
This commit is contained in:
commit
2372b00129
@ -177,13 +177,27 @@ static iomux_v3_cfg_t const rgb_pads[] = {
|
||||
MX6_PAD_DISP0_DAT21__IPU1_DISP0_DATA21 | MUX_PAD_CTRL(NO_PAD_CTRL),
|
||||
MX6_PAD_DISP0_DAT22__IPU1_DISP0_DATA22 | MUX_PAD_CTRL(NO_PAD_CTRL),
|
||||
MX6_PAD_DISP0_DAT23__IPU1_DISP0_DATA23 | MUX_PAD_CTRL(NO_PAD_CTRL),
|
||||
};
|
||||
|
||||
static iomux_v3_cfg_t const bl_pads[] = {
|
||||
MX6_PAD_SD1_DAT3__GPIO1_IO21 | MUX_PAD_CTRL(NO_PAD_CTRL),
|
||||
};
|
||||
|
||||
static void enable_backlight(void)
|
||||
{
|
||||
imx_iomux_v3_setup_multiple_pads(bl_pads, ARRAY_SIZE(bl_pads));
|
||||
gpio_direction_output(DISP0_PWR_EN, 1);
|
||||
}
|
||||
|
||||
static void enable_rgb(struct display_info_t const *dev)
|
||||
{
|
||||
imx_iomux_v3_setup_multiple_pads(rgb_pads, ARRAY_SIZE(rgb_pads));
|
||||
gpio_direction_output(DISP0_PWR_EN, 1);
|
||||
enable_backlight();
|
||||
}
|
||||
|
||||
static void enable_lvds(struct display_info_t const *dev)
|
||||
{
|
||||
enable_backlight();
|
||||
}
|
||||
|
||||
static struct i2c_pads_info i2c_pad_info1 = {
|
||||
@ -370,7 +384,7 @@ struct display_info_t const displays[] = {{
|
||||
.addr = 0,
|
||||
.pixfmt = IPU_PIX_FMT_RGB666,
|
||||
.detect = NULL,
|
||||
.enable = NULL,
|
||||
.enable = enable_lvds,
|
||||
.mode = {
|
||||
.name = "Hannstar-XGA",
|
||||
.refresh = 60,
|
||||
|
@ -66,7 +66,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
#define IOX_SDI IMX_GPIO_NR(5, 10)
|
||||
#define IOX_STCP IMX_GPIO_NR(5, 7)
|
||||
#define IOX_SHCP IMX_GPIO_NR(5, 11)
|
||||
#define IOX_OE IMX_GPIO_NR(5, 18)
|
||||
#define IOX_OE IMX_GPIO_NR(5, 8)
|
||||
|
||||
static iomux_v3_cfg_t const iox_pads[] = {
|
||||
/* IOX_SDI */
|
||||
@ -117,7 +117,7 @@ static enum qn_level seq[3][2] = {
|
||||
|
||||
static enum qn_func qn_output[8] = {
|
||||
qn_reset, qn_reset, qn_reset, qn_enable, qn_disable, qn_reset,
|
||||
qn_disable, qn_enable
|
||||
qn_disable, qn_disable
|
||||
};
|
||||
|
||||
static void iox74lv_init(void)
|
||||
@ -154,8 +154,6 @@ static void iox74lv_init(void)
|
||||
* shift register will be output to pins
|
||||
*/
|
||||
gpio_direction_output(IOX_STCP, 1);
|
||||
|
||||
gpio_direction_output(IOX_OE, 1);
|
||||
};
|
||||
|
||||
#ifdef CONFIG_SYS_I2C_MXC
|
||||
@ -305,7 +303,7 @@ static void setup_iomux_uart(void)
|
||||
|
||||
#define QSPI_PAD_CTRL1 \
|
||||
(PAD_CTL_SRE_FAST | PAD_CTL_SPEED_MED | \
|
||||
PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_47K_UP | PAD_CTL_DSE_60ohm)
|
||||
PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_47K_UP | PAD_CTL_DSE_120ohm)
|
||||
|
||||
static iomux_v3_cfg_t const quadspi_pads[] = {
|
||||
MX6_PAD_NAND_WP_B__QSPI_A_SCLK | MUX_PAD_CTRL(QSPI_PAD_CTRL1),
|
||||
|
@ -171,7 +171,7 @@ static enum qn_level seq[3][2] = {
|
||||
|
||||
static enum qn_func qn_output[8] = {
|
||||
qn_disable, qn_reset, qn_reset, qn_reset, qn_reset, qn_reset, qn_enable,
|
||||
qn_enable
|
||||
qn_disable
|
||||
};
|
||||
|
||||
static void iox74lv_init(void)
|
||||
|
63
board/warp7/README
Normal file
63
board/warp7/README
Normal file
@ -0,0 +1,63 @@
|
||||
How to Update U-Boot on Warp7 board
|
||||
----------------------------------
|
||||
|
||||
Required software on the host PC:
|
||||
|
||||
- imx_usb_loader: https://github.com/boundarydevices/imx_usb_loader
|
||||
|
||||
- dfu-util: http://dfu-util.sourceforge.net/releases/ (if you are in a
|
||||
Debian distribution then you can get it via libdfu-dev package)
|
||||
|
||||
- libusb: http://libusb.org/ (if you are in a Debian distribution
|
||||
then you can get it via libusb-dev and libusb-1.0-0-dev)
|
||||
|
||||
In U-Boot folder, build U-Boot for Warp7:
|
||||
|
||||
$ make mrproper
|
||||
$ make warp7_config
|
||||
$ make
|
||||
|
||||
This will generate the U-Boot binary called u-boot.imx.
|
||||
|
||||
Put warp7 board in USB download mode:
|
||||
|
||||
Remove the CPU board from the base board then put switch 2 in the upper
|
||||
position
|
||||
|
||||
Connect a USB to serial adapter between the host PC and warp7
|
||||
|
||||
Connect a USB cable between the OTG warp7 port and the host PC
|
||||
|
||||
Copy u-boot.imx to the imx_usb_loader folder.
|
||||
|
||||
Load u-boot.imx via USB:
|
||||
|
||||
$ sudo ./imx_usb u-boot.imx
|
||||
|
||||
Then U-Boot should start and its messages will appear in the console program.
|
||||
|
||||
Open a terminal program such as minicom
|
||||
|
||||
Use the default environment variables:
|
||||
|
||||
=> env default -f -a
|
||||
=> saveenv
|
||||
|
||||
Run the DFU command:
|
||||
=> dfu 0 mmc 0
|
||||
|
||||
Transfer u-boot.imx that will be flashed into the eMMC:
|
||||
|
||||
$ sudo dfu-util -D u-boot.imx -a boot
|
||||
|
||||
Then on the U-Boot prompt the following message should be seen after a
|
||||
successful upgrade:
|
||||
|
||||
#DOWNLOAD ... OK
|
||||
Ctrl+C to exit ...
|
||||
|
||||
Remove power from the warp7 board.
|
||||
|
||||
Put warp7 board into normal boot mode (put the switch 2 in the lower position)
|
||||
|
||||
Power up the board and the new updated U-Boot should boot from eMMC
|
@ -32,6 +32,10 @@ int dram_init(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static iomux_v3_cfg_t const wdog_pads[] = {
|
||||
MX7D_PAD_GPIO1_IO00__WDOG1_WDOG_B | MUX_PAD_CTRL(NO_PAD_CTRL),
|
||||
};
|
||||
|
||||
static iomux_v3_cfg_t const uart1_pads[] = {
|
||||
MX7D_PAD_UART1_TX_DATA__UART1_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
|
||||
MX7D_PAD_UART1_RX_DATA__UART1_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
|
||||
@ -100,3 +104,20 @@ int board_usb_phy_mode(int port)
|
||||
{
|
||||
return USB_INIT_DEVICE;
|
||||
}
|
||||
|
||||
int board_late_init(void)
|
||||
{
|
||||
struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR;
|
||||
|
||||
imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads));
|
||||
|
||||
set_wdog_reset(wdog);
|
||||
|
||||
/*
|
||||
* Do not assert internal WDOG_RESET_B_DEB(controlled by bit 4),
|
||||
* since we use PMIC_PWRON to reset the board.
|
||||
*/
|
||||
clrsetbits_le16(&wdog->wcr, 0, 0x10);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -16,9 +16,10 @@
|
||||
#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR
|
||||
|
||||
/* Size of malloc() pool */
|
||||
#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M)
|
||||
#define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M)
|
||||
|
||||
#define CONFIG_BOARD_EARLY_INIT_F
|
||||
#define CONFIG_BOARD_LATE_INIT
|
||||
|
||||
/* MMC Config*/
|
||||
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR
|
||||
@ -27,10 +28,7 @@
|
||||
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
|
||||
|
||||
#define CONFIG_DFU_ENV_SETTINGS \
|
||||
"dfu_alt_info=image raw 0 0x800000;"\
|
||||
"u-boot raw 0 0x4000;"\
|
||||
"bootimg part 0 1;"\
|
||||
"rootfs part 0 2\0" \
|
||||
"dfu_alt_info=boot raw 0x2 0x400 mmcpart 1\0" \
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
CONFIG_DFU_ENV_SETTINGS \
|
||||
|
Loading…
Reference in New Issue
Block a user