Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 52526ba42e4757e0afb0548c8e56cecffac76064

Authored by Vagrant Cascadian
Committed by Stefano Babic
1 parent fab70acf83
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

Set console speed to 115200 on mx6cuboxi. 

By default, u-boot itself outputs on the serial console at 115200, so
it may as well pass the same value to the booted operating system as
well.

Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>

Showing 1 changed file with 1 additions and 1 deletions Inline Diff

include/configs/mx6cuboxi.h
Diff comments   View file @ 52526ba
1 /* 1 /*
2 * Copyright (C) 2015 Freescale Semiconductor, Inc. 2 * Copyright (C) 2015 Freescale Semiconductor, Inc.
3 * 3 *
4 * Configuration settings for the SolidRun mx6 based boards 4 * Configuration settings for the SolidRun mx6 based boards
5 * 5 *
6 * SPDX-License-Identifier: GPL-2.0+ 6 * SPDX-License-Identifier: GPL-2.0+
7 */ 7 */
8 #ifndef __MX6CUBOXI_CONFIG_H 8 #ifndef __MX6CUBOXI_CONFIG_H
9 #define __MX6CUBOXI_CONFIG_H 9 #define __MX6CUBOXI_CONFIG_H
10 10
11 #include <config_distro_defaults.h> 11 #include <config_distro_defaults.h>
12 #include "mx6_common.h" 12 #include "mx6_common.h"
13 13
14 #include "imx6_spl.h" 14 #include "imx6_spl.h"
15 15
16 #define CONFIG_IMX_THERMAL 16 #define CONFIG_IMX_THERMAL
17 17
18 #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) 18 #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
19 #define CONFIG_MXC_UART 19 #define CONFIG_MXC_UART
20 20
21 /* MMC Configs */ 21 /* MMC Configs */
22 #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR 22 #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
23 23
24 /* Ethernet Configuration */ 24 /* Ethernet Configuration */
25 #define CONFIG_FEC_MXC 25 #define CONFIG_FEC_MXC
26 #define CONFIG_MII 26 #define CONFIG_MII
27 #define IMX_FEC_BASE ENET_BASE_ADDR 27 #define IMX_FEC_BASE ENET_BASE_ADDR
28 #define CONFIG_FEC_XCV_TYPE RGMII 28 #define CONFIG_FEC_XCV_TYPE RGMII
29 #define CONFIG_FEC_MXC_PHYADDR 0 29 #define CONFIG_FEC_MXC_PHYADDR 0
30 #define CONFIG_PHYLIB 30 #define CONFIG_PHYLIB
31 #define CONFIG_PHY_ATHEROS 31 #define CONFIG_PHY_ATHEROS
32 32
33 /* Framebuffer */ 33 /* Framebuffer */
34 #define CONFIG_VIDEO_IPUV3 34 #define CONFIG_VIDEO_IPUV3
35 #define CONFIG_IPUV3_CLK 260000000 35 #define CONFIG_IPUV3_CLK 260000000
36 #define CONFIG_VIDEO_BMP_RLE8 36 #define CONFIG_VIDEO_BMP_RLE8
37 #define CONFIG_SPLASH_SCREEN 37 #define CONFIG_SPLASH_SCREEN
38 #define CONFIG_SPLASH_SCREEN_ALIGN 38 #define CONFIG_SPLASH_SCREEN_ALIGN
39 #define CONFIG_BMP_16BPP 39 #define CONFIG_BMP_16BPP
40 #define CONFIG_VIDEO_LOGO 40 #define CONFIG_VIDEO_LOGO
41 #define CONFIG_VIDEO_BMP_LOGO 41 #define CONFIG_VIDEO_BMP_LOGO
42 #define CONFIG_IMX_HDMI 42 #define CONFIG_IMX_HDMI
43 #define CONFIG_CMD_HDMIDETECT 43 #define CONFIG_CMD_HDMIDETECT
44 #define CONFIG_IMX_VIDEO_SKIP 44 #define CONFIG_IMX_VIDEO_SKIP
45 45
46 /* USB */ 46 /* USB */
47 #define CONFIG_USB_EHCI 47 #define CONFIG_USB_EHCI
48 #define CONFIG_USB_EHCI_MX6 48 #define CONFIG_USB_EHCI_MX6
49 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET 49 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
50 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) 50 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
51 #define CONFIG_MXC_USB_FLAGS 0 51 #define CONFIG_MXC_USB_FLAGS 0
52 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 52 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
53 #define CONFIG_SYS_USB_EVENT_POLL 53 #define CONFIG_SYS_USB_EVENT_POLL
54 #define CONFIG_PREBOOT \ 54 #define CONFIG_PREBOOT \
55 "if hdmidet; then " \ 55 "if hdmidet; then " \
56 "usb start; " \ 56 "usb start; " \
57 "setenv stdin serial,usbkbd; "\ 57 "setenv stdin serial,usbkbd; "\
58 "setenv stdout serial,vga; " \ 58 "setenv stdout serial,vga; " \
59 "setenv stderr serial,vga; " \ 59 "setenv stderr serial,vga; " \
60 "else " \ 60 "else " \
61 "setenv stdin serial; " \ 61 "setenv stdin serial; " \
62 "setenv stdout serial; " \ 62 "setenv stdout serial; " \
63 "setenv stderr serial; " \ 63 "setenv stderr serial; " \
64 "fi;" 64 "fi;"
65 65
66 /* Command definition */ 66 /* Command definition */
67 67
68 #define CONFIG_MXC_UART_BASE UART1_BASE 68 #define CONFIG_MXC_UART_BASE UART1_BASE
69 #define CONSOLE_DEV "ttymxc0" 69 #define CONSOLE_DEV "ttymxc0"
70 #define CONFIG_SYS_FSL_USDHC_NUM 1 70 #define CONFIG_SYS_FSL_USDHC_NUM 1
71 #define CONFIG_SYS_MMC_ENV_DEV 0 /* SDHC2 */ 71 #define CONFIG_SYS_MMC_ENV_DEV 0 /* SDHC2 */
72 72
73 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG 73 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
74 #ifndef CONFIG_SPL_BUILD 74 #ifndef CONFIG_SPL_BUILD
75 #define CONFIG_EXTRA_ENV_SETTINGS \ 75 #define CONFIG_EXTRA_ENV_SETTINGS \
76 "fdtfile=undefined\0" \ 76 "fdtfile=undefined\0" \
77 "fdt_addr_r=0x18000000\0" \ 77 "fdt_addr_r=0x18000000\0" \
78 "fdt_addr=0x18000000\0" \ 78 "fdt_addr=0x18000000\0" \
79 "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ 79 "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
80 "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ 80 "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
81 "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ 81 "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
82 "ramdisk_addr_r=0x13000000\0" \ 82 "ramdisk_addr_r=0x13000000\0" \
83 "ramdiskaddr=0x13000000\0" \ 83 "ramdiskaddr=0x13000000\0" \
84 "initrd_high=0xffffffff\0" \ 84 "initrd_high=0xffffffff\0" \
85 "fdt_high=0xffffffff\0" \ 85 "fdt_high=0xffffffff\0" \
86 "ip_dyn=yes\0" \ 86 "ip_dyn=yes\0" \
87 "console=" CONSOLE_DEV "\0" \ 87 "console=" CONSOLE_DEV ",115200\0" \
88 "bootm_size=0x10000000\0" \ 88 "bootm_size=0x10000000\0" \
89 "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ 89 "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
90 "update_sd_firmware=" \ 90 "update_sd_firmware=" \
91 "if test ${ip_dyn} = yes; then " \ 91 "if test ${ip_dyn} = yes; then " \
92 "setenv get_cmd dhcp; " \ 92 "setenv get_cmd dhcp; " \
93 "else " \ 93 "else " \
94 "setenv get_cmd tftp; " \ 94 "setenv get_cmd tftp; " \
95 "fi; " \ 95 "fi; " \
96 "if mmc dev ${mmcdev}; then " \ 96 "if mmc dev ${mmcdev}; then " \
97 "if ${get_cmd} ${update_sd_firmware_filename}; then " \ 97 "if ${get_cmd} ${update_sd_firmware_filename}; then " \
98 "setexpr fw_sz ${filesize} / 0x200; " \ 98 "setexpr fw_sz ${filesize} / 0x200; " \
99 "setexpr fw_sz ${fw_sz} + 1; " \ 99 "setexpr fw_sz ${fw_sz} + 1; " \
100 "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ 100 "mmc write ${loadaddr} 0x2 ${fw_sz}; " \
101 "fi; " \ 101 "fi; " \
102 "fi\0" \ 102 "fi\0" \
103 "findfdt="\ 103 "findfdt="\
104 "if test $board_name = HUMMINGBOARD && test $board_rev = MX6Q ; then " \ 104 "if test $board_name = HUMMINGBOARD && test $board_rev = MX6Q ; then " \
105 "setenv fdtfile imx6q-hummingboard.dtb; fi; " \ 105 "setenv fdtfile imx6q-hummingboard.dtb; fi; " \
106 "if test $board_name = HUMMINGBOARD && test $board_rev = MX6DL ; then " \ 106 "if test $board_name = HUMMINGBOARD && test $board_rev = MX6DL ; then " \
107 "setenv fdtfile imx6dl-hummingboard.dtb; fi; " \ 107 "setenv fdtfile imx6dl-hummingboard.dtb; fi; " \
108 "if test $board_name = CUBOXI && test $board_rev = MX6Q ; then " \ 108 "if test $board_name = CUBOXI && test $board_rev = MX6Q ; then " \
109 "setenv fdtfile imx6q-cubox-i.dtb; fi; " \ 109 "setenv fdtfile imx6q-cubox-i.dtb; fi; " \
110 "if test $board_name = CUBOXI && test $board_rev = MX6DL ; then " \ 110 "if test $board_name = CUBOXI && test $board_rev = MX6DL ; then " \
111 "setenv fdtfile imx6dl-cubox-i.dtb; fi; " \ 111 "setenv fdtfile imx6dl-cubox-i.dtb; fi; " \
112 "if test $fdtfile = undefined; then " \ 112 "if test $fdtfile = undefined; then " \
113 "echo WARNING: Could not determine dtb to use; fi; \0" \ 113 "echo WARNING: Could not determine dtb to use; fi; \0" \
114 BOOTENV 114 BOOTENV
115 115
116 #define CONFIG_BOOTCOMMAND \ 116 #define CONFIG_BOOTCOMMAND \
117 "run findfdt; " \ 117 "run findfdt; " \
118 "run distro_bootcmd" 118 "run distro_bootcmd"
119 119
120 #define BOOT_TARGET_DEVICES(func) \ 120 #define BOOT_TARGET_DEVICES(func) \
121 func(MMC, mmc, 0) \ 121 func(MMC, mmc, 0) \
122 func(USB, usb, 0) \ 122 func(USB, usb, 0) \
123 func(PXE, pxe, na) \ 123 func(PXE, pxe, na) \
124 func(DHCP, dhcp, na) 124 func(DHCP, dhcp, na)
125 125
126 #include <config_distro_bootcmd.h> 126 #include <config_distro_bootcmd.h>
127 127
128 #else 128 #else
129 #define CONFIG_EXTRA_ENV_SETTINGS 129 #define CONFIG_EXTRA_ENV_SETTINGS
130 #endif /* CONFIG_SPL_BUILD */ 130 #endif /* CONFIG_SPL_BUILD */
131 131
132 /* Physical Memory Map */ 132 /* Physical Memory Map */
133 #define CONFIG_NR_DRAM_BANKS 1 133 #define CONFIG_NR_DRAM_BANKS 1
134 #define CONFIG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR 134 #define CONFIG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR
135 #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR 135 #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
136 #define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE 136 #define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
137 137
138 #define CONFIG_SYS_INIT_SP_OFFSET \ 138 #define CONFIG_SYS_INIT_SP_OFFSET \
139 (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) 139 (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
140 #define CONFIG_SYS_INIT_SP_ADDR \ 140 #define CONFIG_SYS_INIT_SP_ADDR \
141 (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) 141 (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
142 142
143 /* Environment organization */ 143 /* Environment organization */
144 #define CONFIG_ENV_SIZE (8 * 1024) 144 #define CONFIG_ENV_SIZE (8 * 1024)
145 #define CONFIG_ENV_IS_IN_MMC 145 #define CONFIG_ENV_IS_IN_MMC
146 #define CONFIG_ENV_OFFSET (8 * 64 * 1024) 146 #define CONFIG_ENV_OFFSET (8 * 64 * 1024)
147 147
148 #endif /* __MX6CUBOXI_CONFIG_H */ 148 #endif /* __MX6CUBOXI_CONFIG_H */
149 149