Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 57ba8d6ddc5cbad29316fc34aa1a764cac6e7b89

Authored by Semen Protsenko
Committed by Tom Rini
1 parent ebeda0b117
Exists in smarc_8mq_lf_v2020.04 and in 18 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.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

arm: am57xx: Keep environment in eMMC 

Use eMMC (instead of SD card) to store U-Boot environment. Use
"reserved" partition for U-Boot environment.

Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Lokesh Vutla <lokeshvuta@ti.com>

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

include/configs/am57xx_evm.h
Diff comments   View file @ 57ba8d6
1 /* 1 /*
2 * (C) Copyright 2014 2 * (C) Copyright 2014
3 * Texas Instruments Incorporated. 3 * Texas Instruments Incorporated.
4 * Felipe Balbi <balbi@ti.com> 4 * Felipe Balbi <balbi@ti.com>
5 * 5 *
6 * Configuration settings for the TI Beagle x15 board. 6 * Configuration settings for the TI Beagle x15 board.
7 * See ti_omap5_common.h for omap5 common settings. 7 * See ti_omap5_common.h for omap5 common settings.
8 * 8 *
9 * SPDX-License-Identifier: GPL-2.0+ 9 * SPDX-License-Identifier: GPL-2.0+
10 */ 10 */
11 11
12 #ifndef __CONFIG_AM57XX_EVM_H 12 #ifndef __CONFIG_AM57XX_EVM_H
13 #define __CONFIG_AM57XX_EVM_H 13 #define __CONFIG_AM57XX_EVM_H
14 14
15 #include <environment/ti/dfu.h> 15 #include <environment/ti/dfu.h>
16 #include <linux/sizes.h>
16 17
17 #ifdef CONFIG_SPL_BUILD 18 #ifdef CONFIG_SPL_BUILD
18 #define CONFIG_IODELAY_RECALIBRATION 19 #define CONFIG_IODELAY_RECALIBRATION
19 #endif 20 #endif
20 21
21 #define CONFIG_NR_DRAM_BANKS 2 22 #define CONFIG_NR_DRAM_BANKS 2
22 23
23 #define CONFIG_ENV_SIZE (64 << 10) 24 /* MMC ENV related defines */
24 #define CONFIG_ENV_IS_IN_FAT 25 #define CONFIG_ENV_IS_IN_MMC
25 #define FAT_ENV_INTERFACE "mmc" 26 #define CONFIG_SYS_MMC_ENV_DEV 1 /* eMMC */
26 #define FAT_ENV_DEVICE_AND_PART "0:1" 27 #define CONFIG_SYS_MMC_ENV_PART 0
27 #define FAT_ENV_FILE "uboot.env" 28 #define CONFIG_ENV_SIZE SZ_128K
29 #define CONFIG_ENV_OFFSET 0x260000
30 #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
31 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
28 32
29 #define CONSOLEDEV "ttyO2" 33 #define CONSOLEDEV "ttyO2"
30 #define CONFIG_SYS_NS16550_COM1 UART1_BASE /* Base EVM has UART0 */ 34 #define CONFIG_SYS_NS16550_COM1 UART1_BASE /* Base EVM has UART0 */
31 #define CONFIG_SYS_NS16550_COM2 UART2_BASE /* UART2 */ 35 #define CONFIG_SYS_NS16550_COM2 UART2_BASE /* UART2 */
32 #define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */ 36 #define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */
33 37
34 #define CONFIG_ENV_EEPROM_IS_ON_I2C 38 #define CONFIG_ENV_EEPROM_IS_ON_I2C
35 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ 39 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */
36 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 40 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
37 41
38 #define CONFIG_SYS_OMAP_ABE_SYSCK 42 #define CONFIG_SYS_OMAP_ABE_SYSCK
39 43
40 /* Define the default GPT table for eMMC */ 44 /* Define the default GPT table for eMMC */
41 #define PARTS_DEFAULT \ 45 #define PARTS_DEFAULT \
42 /* Linux partitions */ \ 46 /* Linux partitions */ \
43 "uuid_disk=${uuid_gpt_disk};" \ 47 "uuid_disk=${uuid_gpt_disk};" \
44 "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \ 48 "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \
45 /* Android partitions */ \ 49 /* Android partitions */ \
46 "partitions_android=" \ 50 "partitions_android=" \
47 "uuid_disk=${uuid_gpt_disk};" \ 51 "uuid_disk=${uuid_gpt_disk};" \
48 "name=xloader,start=128K,size=256K,uuid=${uuid_gpt_xloader};" \ 52 "name=xloader,start=128K,size=256K,uuid=${uuid_gpt_xloader};" \
49 "name=bootloader,size=1792K,uuid=${uuid_gpt_bootloader};" \ 53 "name=bootloader,size=1792K,uuid=${uuid_gpt_bootloader};" \
50 "name=environment,size=128K,uuid=${uuid_gpt_environment};" \ 54 "name=environment,size=128K,uuid=${uuid_gpt_environment};" \
51 "name=misc,size=128K,uuid=${uuid_gpt_misc};" \ 55 "name=misc,size=128K,uuid=${uuid_gpt_misc};" \
52 "name=reserved,size=256K,uuid=${uuid_gpt_reserved};" \ 56 "name=reserved,size=256K,uuid=${uuid_gpt_reserved};" \
53 "name=efs,size=16M,uuid=${uuid_gpt_efs};" \ 57 "name=efs,size=16M,uuid=${uuid_gpt_efs};" \
54 "name=crypto,size=16K,uuid=${uuid_gpt_crypto};" \ 58 "name=crypto,size=16K,uuid=${uuid_gpt_crypto};" \
55 "name=recovery,size=10M,uuid=${uuid_gpt_recovery};" \ 59 "name=recovery,size=10M,uuid=${uuid_gpt_recovery};" \
56 "name=boot,size=10M,uuid=${uuid_gpt_boot};" \ 60 "name=boot,size=10M,uuid=${uuid_gpt_boot};" \
57 "name=system,size=768M,uuid=${uuid_gpt_system};" \ 61 "name=system,size=768M,uuid=${uuid_gpt_system};" \
58 "name=cache,size=256M,uuid=${uuid_gpt_cache};" \ 62 "name=cache,size=256M,uuid=${uuid_gpt_cache};" \
59 "name=ipu1,size=1M,uuid=${uuid_gpt_ipu1};" \ 63 "name=ipu1,size=1M,uuid=${uuid_gpt_ipu1};" \
60 "name=ipu2,size=1M,uuid=${uuid_gpt_ipu2};" \ 64 "name=ipu2,size=1M,uuid=${uuid_gpt_ipu2};" \
61 "name=userdata,size=-,uuid=${uuid_gpt_userdata}" 65 "name=userdata,size=-,uuid=${uuid_gpt_userdata}"
62 66
63 #define DFUARGS \ 67 #define DFUARGS \
64 "dfu_bufsiz=0x10000\0" \ 68 "dfu_bufsiz=0x10000\0" \
65 DFU_ALT_INFO_MMC \ 69 DFU_ALT_INFO_MMC \
66 DFU_ALT_INFO_EMMC \ 70 DFU_ALT_INFO_EMMC \
67 DFU_ALT_INFO_RAM \ 71 DFU_ALT_INFO_RAM \
68 72
69 #include <configs/ti_omap5_common.h> 73 #include <configs/ti_omap5_common.h>
70 74
71 /* Enhance our eMMC support / experience. */ 75 /* Enhance our eMMC support / experience. */
72 #define CONFIG_RANDOM_UUID 76 #define CONFIG_RANDOM_UUID
73 #define CONFIG_HSMMC2_8BIT 77 #define CONFIG_HSMMC2_8BIT
74 78
75 /* CPSW Ethernet */ 79 /* CPSW Ethernet */
76 #define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */ 80 #define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */
77 #define CONFIG_BOOTP_DNS2 81 #define CONFIG_BOOTP_DNS2
78 #define CONFIG_BOOTP_SEND_HOSTNAME 82 #define CONFIG_BOOTP_SEND_HOSTNAME
79 #define CONFIG_BOOTP_GATEWAY 83 #define CONFIG_BOOTP_GATEWAY
80 #define CONFIG_BOOTP_SUBNETMASK 84 #define CONFIG_BOOTP_SUBNETMASK
81 #define CONFIG_NET_RETRY_COUNT 10 85 #define CONFIG_NET_RETRY_COUNT 10
82 #define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ 86 #define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */
83 #define CONFIG_MII /* Required in net/eth.c */ 87 #define CONFIG_MII /* Required in net/eth.c */
84 #define CONFIG_PHY_GIGE /* per-board part of CPSW */ 88 #define CONFIG_PHY_GIGE /* per-board part of CPSW */
85 #define CONFIG_PHYLIB 89 #define CONFIG_PHYLIB
86 #define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */ 90 #define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */
87 91
88 #define CONFIG_SUPPORT_EMMC_BOOT 92 #define CONFIG_SUPPORT_EMMC_BOOT
89 93
90 /* USB xHCI HOST */ 94 /* USB xHCI HOST */
91 #define CONFIG_USB_XHCI_OMAP 95 #define CONFIG_USB_XHCI_OMAP
92 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 96 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
93 97
94 #define CONFIG_OMAP_USB_PHY 98 #define CONFIG_OMAP_USB_PHY
95 #define CONFIG_OMAP_USB3PHY1_HOST 99 #define CONFIG_OMAP_USB3PHY1_HOST
96 100
97 /* SATA */ 101 /* SATA */
98 #define CONFIG_SCSI 102 #define CONFIG_SCSI
99 #define CONFIG_LIBATA 103 #define CONFIG_LIBATA
100 #define CONFIG_SCSI_AHCI 104 #define CONFIG_SCSI_AHCI
101 #define CONFIG_SCSI_AHCI_PLAT 105 #define CONFIG_SCSI_AHCI_PLAT
102 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 106 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 1
103 #define CONFIG_SYS_SCSI_MAX_LUN 1 107 #define CONFIG_SYS_SCSI_MAX_LUN 1
104 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ 108 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
105 CONFIG_SYS_SCSI_MAX_LUN) 109 CONFIG_SYS_SCSI_MAX_LUN)
106 110
107 /* 111 /*
108 * Default to using SPI for environment, etc. 112 * Default to using SPI for environment, etc.
109 * 0x000000 - 0x040000 : QSPI.SPL (256KiB) 113 * 0x000000 - 0x040000 : QSPI.SPL (256KiB)
110 * 0x040000 - 0x140000 : QSPI.u-boot (1MiB) 114 * 0x040000 - 0x140000 : QSPI.u-boot (1MiB)
111 * 0x140000 - 0x1C0000 : QSPI.u-boot-spl-os (512KiB) 115 * 0x140000 - 0x1C0000 : QSPI.u-boot-spl-os (512KiB)
112 * 0x1C0000 - 0x1D0000 : QSPI.u-boot-env (64KiB) 116 * 0x1C0000 - 0x1D0000 : QSPI.u-boot-env (64KiB)
113 * 0x1D0000 - 0x1E0000 : QSPI.u-boot-env.backup1 (64KiB) 117 * 0x1D0000 - 0x1E0000 : QSPI.u-boot-env.backup1 (64KiB)
114 * 0x1E0000 - 0x9E0000 : QSPI.kernel (8MiB) 118 * 0x1E0000 - 0x9E0000 : QSPI.kernel (8MiB)
115 * 0x9E0000 - 0x2000000 : USERLAND 119 * 0x9E0000 - 0x2000000 : USERLAND
116 */ 120 */
117 #define CONFIG_SYS_SPI_KERNEL_OFFS 0x1E0000 121 #define CONFIG_SYS_SPI_KERNEL_OFFS 0x1E0000
118 #define CONFIG_SYS_SPI_ARGS_OFFS 0x140000 122 #define CONFIG_SYS_SPI_ARGS_OFFS 0x140000
119 #define CONFIG_SYS_SPI_ARGS_SIZE 0x80000 123 #define CONFIG_SYS_SPI_ARGS_SIZE 0x80000
120 124
121 /* SPI SPL */ 125 /* SPI SPL */
122 #define CONFIG_TI_EDMA3 126 #define CONFIG_TI_EDMA3
123 #define CONFIG_SPL_SPI_LOAD 127 #define CONFIG_SPL_SPI_LOAD
124 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000 128 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000
125 129
126 /* SPI */ 130 /* SPI */
127 #undef CONFIG_OMAP3_SPI 131 #undef CONFIG_OMAP3_SPI
128 #define CONFIG_TI_SPI_MMAP 132 #define CONFIG_TI_SPI_MMAP
129 #define CONFIG_SF_DEFAULT_SPEED 76800000 133 #define CONFIG_SF_DEFAULT_SPEED 76800000
130 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 134 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
131 #define CONFIG_QSPI_QUAD_SUPPORT 135 #define CONFIG_QSPI_QUAD_SUPPORT
132 136
133 #endif /* __CONFIG_AM57XX_EVM_H */ 137 #endif /* __CONFIG_AM57XX_EVM_H */
134 138