Skip to content

Commit b759d20

Browse files
charleseidsnesscharleseidsness
committed
transitioning from saved environment to embedded, for secure boot support
1 parent bce74ea commit b759d20

File tree

1 file changed

+98
-46
lines changed

1 file changed

+98
-46
lines changed

‎include/configs/ls1046ccx.h

+98-46
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
#ifndef __LS1046CCX_H__
88
#define __LS1046CCX_H__
99

10+
#define SPL_NO_MISC
1011
#include "ls1046a_common.h"
12+
#undef CONFIG_SYS_DPAA_FMAN
1113

1214
#define CONFIG_SYS_CLK_FREQ 100000000
1315
#define CONFIG_DDR_CLK_FREQ 100000000
1416

15-
/* Move up so can fit bootloader in 8MB FLASH */
16-
#undef CONFIG_SYS_FMAN_FW_ADDR
17-
#define CONFIG_SYS_FMAN_FW_ADDR 0x400000
1817

1918
#define CONFIG_LAYERSCAPE_NS_ACCESS
2019

@@ -26,45 +25,7 @@
2625
#define SPD_EEPROM_ADDRESS 0x51
2726
#define CONFIG_SYS_SPD_BUS_NUM 0
2827

29-
#ifndef CONFIG_SPL
30-
#endif
31-
/*
32-
* Environment
33-
*/
34-
#ifndef SPL_NO_ENV
35-
#define CONFIG_ENV_OVERWRITE
36-
#endif
37-
38-
#define CONFIG_SYS_MMC_ENV_DEV 0
39-
40-
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
41-
#define CONFIG_ENV_OFFSET 0x500000 /* 5MB */
42-
#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256KB */
43-
44-
/* FMan */
45-
#ifndef SPL_NO_FMAN
46-
47-
#ifdef CONFIG_NET
48-
#define CONFIG_PHY_REALTEK
49-
#endif
50-
51-
#ifdef CONFIG_SYS_DPAA_FMAN
52-
#define CONFIG_FMAN_ENET
53-
#define RGMII_PHY1_ADDR 0x0
54-
#define RGMII_PHY2_ADDR 0x3
55-
56-
#define SGMII_PHY1_ADDR 0xc
57-
#define SGMII_PHY2_ADDR 0xf
58-
59-
#define SGMII_PHY3_ADDR 0x0
60-
#define SGMII_PHY4_ADDR 0x1
61-
62-
#define FDT_SEQ_MACADDR_FROM_ENV
63-
64-
#define CONFIG_ETHPRIME "FM1@DTSEC3"
65-
#endif
66-
67-
#endif
28+
#define CONFIG_ENV_SIZE 0x2000
6829

6930
/* QSPI device */
7031
#ifndef SPL_NO_QSPI
@@ -75,10 +36,101 @@
7536
#endif
7637
#endif
7738

78-
#define SPL_NO_MISC
79-
#undef CONFIG_BOOTCOMMAND
80-
#define QSPI_NOR_BOOTCOMMAND "run qspi_bootcmd"
81-
#define SD_BOOTCOMMAND "run sd_bootcmd;"
39+
#define SD_BOOTCOMMAND "echo NO BOOT CMD SD"
40+
#define QSPI_NOR_BOOTCOMMAND "echo NO BOOT CMD QSPI"
41+
#define CONFIG_EXTRA_ENV_SETTINGS \
42+
"hwconfig=fsl_ddr:bank_intlv=auto\0" \
43+
"bootargs=earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200\0" \
44+
"bootargs_enable_loader=setenv bootargs ${bootargs} loader\0" \
45+
"bootargs_set_rootfs=setenv bootargs ${bootargs} root=/dev/sda${bootarg_rootpart} ro\0" \
46+
"bootargs_set_console=setenv bootargs ${bootargs} console=ttyS0,${baudrate} earlycon=uart8250,mmio,0x21c0500\0" \
47+
"bootarg_rootpart=2\0" \
48+
"loadaddr_ram=0xa0000000\0" \
49+
"loadaddr_flash=0x0\0" \
50+
"loadaddr_ram_kernel=0xa0800000\0" \
51+
"loadaddr_ram_dtb=0xa0000000\0" \
52+
"filename_onetimeenv=uEnv.onetime.txt\0" \
53+
"ram_to_flash=" \
54+
"sf probe && " \
55+
"sf erase ${loadaddr_flash} +${filesize} && " \
56+
"sf write ${loadaddr_ram} ${loadaddr_flash} ${filesize}\0" \
57+
"ram_to_sata=" \
58+
"scsi rescan && " \
59+
"ext4write scsi 0:1 ${loadaddr_ram} /${filename} ${filesize}\0" \
60+
"sdcard_to_ram=ext4load mmc 0:1 ${loadaddr_ram} ${filename}\0" \
61+
"sata_to_ram=ext4load scsi 0:1 ${loadaddr_ram} ${filename}\0" \
62+
"sdcard_to_flash=" \
63+
"run sdcard_to_ram && " \
64+
"run ram_to_flash\0" \
65+
"sdcard_to_flash_pbl=" \
66+
"setenv filename bl2.pbl && " \
67+
"setenv loadaddr_flash 0x000000 && " \
68+
"run sdcard_to_flash\0" \
69+
"sdcard_to_flash_fib=" \
70+
"setenv filename fip.pbl && " \
71+
"setenv loadaddr_flash 0x100000 && " \
72+
"run sdcard_to_flash\0" \
73+
"sdcard_to_flash_fman=" \
74+
"setenv filename fman.bin && " \
75+
"setenv loadaddr_flash 0x400000 && " \
76+
"run sdcard_to_flash\0" \
77+
"sdcard_to_ram_dtb=" \
78+
"setenv filename linux.dtb && " \
79+
"setenv loadaddr_ram ${loadaddr_ram_dtb} && " \
80+
"run sdcard_to_ram\0" \
81+
"sdcard_to_ram_kernel=" \
82+
"setenv filename Image && " \
83+
"setenv loadaddr_ram ${loadaddr_ram_kernel} && " \
84+
"run sdcard_to_ram\0" \
85+
"sata_to_ram_dtb=" \
86+
"setenv filename boot-${bootarg_rootpart}/linux.dtb && " \
87+
"setenv loadaddr_ram ${loadaddr_ram_dtb} && " \
88+
"run sata_to_ram\0" \
89+
"sata_to_ram_kernel=" \
90+
"setenv filename boot-${bootarg_rootpart}/Image && " \
91+
"setenv loadaddr_ram ${loadaddr_ram_kernel} && " \
92+
"run sata_to_ram\0" \
93+
"sata_to_env_rootpart=" \
94+
"setenv filename ${filename_onetimeenv} && " \
95+
"if run sdcard_to_ram; then " \
96+
"env import -t ${loadaddr_ram} ${filesize} lastboot defaultrootpart onetimerootpart; " \
97+
"fi && " \
98+
"if env exists defaultrootpart; then "\
99+
"setenv bootarg_rootpart ${defaultrootpart}; " \
100+
"else " \
101+
"setenv defaultrootpart ${bootarg_rootpart}; " \
102+
"fi && " \
103+
"if env exists onetimerootpart; then " \
104+
"setenv bootarg_rootpart ${onetimerootpart}; " \
105+
"fi\0" \
106+
"env_to_sata_rootpart=" \
107+
"if env exists onetimerootpart || test \"${lastboot}\" != \"${bootarg_rootpart}\"; then " \
108+
"setenv lastboot ${bootarg_rootpart} && " \
109+
"env export -t ${loadaddr_ram} lastboot defaultrootpart && " \
110+
"setenv filename ${filename_onetimeenv} && " \
111+
"run ram_to_sata; " \
112+
"fi\0" \
113+
"boot_kernel_loader=" \
114+
"run bootargs_enable_loader && " \
115+
"run sdcard_to_ram_dtb && " \
116+
"run sdcard_to_ram_kernel && " \
117+
"booti ${loadaddr_ram_kernel} - ${loadaddr_ram_dtb}\0" \
118+
"boot_kernel_normal=" \
119+
"run bootargs_set_rootfs && " \
120+
"run bootargs_set_console && " \
121+
"run sata_to_ram_dtb && " \
122+
"run sata_to_ram_kernel && " \
123+
"booti ${loadaddr_ram_kernel} - ${loadaddr_ram_dtb}\0" \
124+
"system_load=" \
125+
"run sdcard_to_flash_pbl && " \
126+
"run sdcard_to_flash_fib && " \
127+
"run sdcard_to_flash_fman && " \
128+
"run boot_kernel_loader\0" \
129+
"system_boot=" \
130+
"scsi rescan &&" \
131+
"run sata_to_env_rootpart &&" \
132+
"run env_to_sata_rootpart &&" \
133+
"run boot_kernel_normal\0" \
82134

83135
#include <asm/fsl_secure_boot.h>
84136

0 commit comments

Comments
 (0)