Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 0ab5433da27005d50e186618eef5c91a81cd300d

Authored by Wenyou Yang
Committed by Simon Glass
1 parent 9daf89cb68
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

configs: at91sam9n12ek: Update for DT and DM support 

Update the configuration files to support the device tree and driver
model. The device clock and pins configuration are handled by the
clock and the pinctrl drivers respectively.

Because the limitation of internal SRAM size, the SPL with driver
model can't be supported, disable the SPL option.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

Showing 5 changed files with 58 additions and 35 deletions Side-by-side Diff

board/atmel/at91sam9n12ek/at91sam9n12ek.c
Diff comments   View file @ 0ab5433
... ... @@ -133,6 +133,7 @@
133 133 #endif /* CONFIG_LCD */
134 134  
135 135 /* SPI chip select control */
  136 +#ifndef CONFIG_DM_SPI
136 137 #ifdef CONFIG_ATMEL_SPI
137 138 #include <spi.h>
138 139 int spi_cs_is_valid(unsigned int bus, unsigned int cs)
... ... @@ -164,6 +165,7 @@
164 165 }
165 166 }
166 167 #endif /* CONFIG_ATMEL_SPI */
  168 +#endif
167 169  
168 170 #ifdef CONFIG_GENERIC_ATMEL_MCI
169 171 int board_mmc_init(bd_t *bd)
configs/at91sam9n12ek_mmc_defconfig
Diff comments   View file @ 0ab5433
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_AT91=y
3 3 CONFIG_TARGET_AT91SAM9N12EK=y
  4 +CONFIG_SYS_MALLOC_F_LEN=0x2000
  5 +CONFIG_DEFAULT_DEVICE_TREE="at91sam9n12ek"
4 6 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_MMC"
5 7 CONFIG_BOOTDELAY=3
6 8 # CONFIG_CONSOLE_MUX is not set
7 9  
8 10  
9 11  
... ... @@ -19,10 +21,25 @@
19 21 CONFIG_CMD_DHCP=y
20 22 CONFIG_CMD_PING=y
21 23 CONFIG_CMD_FAT=y
  24 +CONFIG_OF_CONTROL=y
  25 +CONFIG_DM=y
  26 +CONFIG_CLK=y
  27 +CONFIG_CLK_AT91=y
  28 +CONFIG_DM_GPIO=y
  29 +CONFIG_AT91_GPIO=y
  30 +CONFIG_DM_MMC=y
  31 +CONFIG_GENERIC_ATMEL_MCI=y
  32 +CONFIG_DM_SPI_FLASH=y
22 33 CONFIG_SPI_FLASH=y
23 34 CONFIG_SPI_FLASH_ATMEL=y
  35 +CONFIG_PINCTRL=y
  36 +CONFIG_PINCTRL_AT91=y
  37 +CONFIG_DM_SERIAL=y
  38 +CONFIG_ATMEL_USART=y
  39 +CONFIG_DM_SPI=y
  40 +CONFIG_ATMEL_SPI=y
24 41 CONFIG_USB=y
  42 +CONFIG_DM_USB=y
25 43 CONFIG_USB_STORAGE=y
26 44 CONFIG_LCD=y
27   -CONFIG_OF_LIBFDT=y
configs/at91sam9n12ek_nandflash_defconfig
Diff comments   View file @ 0ab5433
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_AT91=y
3 3 CONFIG_TARGET_AT91SAM9N12EK=y
4   -CONFIG_SPL_GPIO_SUPPORT=y
5   -CONFIG_SPL_LIBCOMMON_SUPPORT=y
6   -CONFIG_SPL_LIBGENERIC_SUPPORT=y
7   -CONFIG_SPL_SERIAL_SUPPORT=y
8   -CONFIG_SPL_NAND_SUPPORT=y
  4 +CONFIG_SYS_MALLOC_F_LEN=0x2000
  5 +CONFIG_DEFAULT_DEVICE_TREE="at91sam9n12ek"
9 6 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_NANDFLASH"
10 7 CONFIG_BOOTDELAY=3
11 8 # CONFIG_CONSOLE_MUX is not set
12 9 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
13 10 # CONFIG_DISPLAY_BOARDINFO is not set
14   -CONFIG_SPL=y
15 11 CONFIG_HUSH_PARSER=y
16 12 CONFIG_SYS_PROMPT="U-Boot> "
17 13 CONFIG_CMD_BOOTZ=y
18 14  
19 15  
20 16  
... ... @@ -25,10 +21,25 @@
25 21 CONFIG_CMD_DHCP=y
26 22 CONFIG_CMD_PING=y
27 23 CONFIG_CMD_FAT=y
  24 +CONFIG_OF_CONTROL=y
  25 +CONFIG_DM=y
  26 +CONFIG_CLK=y
  27 +CONFIG_CLK_AT91=y
  28 +CONFIG_DM_GPIO=y
  29 +CONFIG_AT91_GPIO=y
  30 +CONFIG_DM_MMC=y
  31 +CONFIG_GENERIC_ATMEL_MCI=y
  32 +CONFIG_DM_SPI_FLASH=y
28 33 CONFIG_SPI_FLASH=y
29 34 CONFIG_SPI_FLASH_ATMEL=y
  35 +CONFIG_PINCTRL=y
  36 +CONFIG_PINCTRL_AT91=y
  37 +CONFIG_DM_SERIAL=y
  38 +CONFIG_ATMEL_USART=y
  39 +CONFIG_DM_SPI=y
  40 +CONFIG_ATMEL_SPI=y
30 41 CONFIG_USB=y
  42 +CONFIG_DM_USB=y
31 43 CONFIG_USB_STORAGE=y
32 44 CONFIG_LCD=y
33   -CONFIG_OF_LIBFDT=y
configs/at91sam9n12ek_spiflash_defconfig
Diff comments   View file @ 0ab5433
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_AT91=y
3 3 CONFIG_TARGET_AT91SAM9N12EK=y
4   -CONFIG_SPL_GPIO_SUPPORT=y
5   -CONFIG_SPL_LIBCOMMON_SUPPORT=y
6   -CONFIG_SPL_LIBGENERIC_SUPPORT=y
7   -CONFIG_SPL_SERIAL_SUPPORT=y
8   -CONFIG_SPL_SPI_FLASH_SUPPORT=y
9   -CONFIG_SPL_SPI_SUPPORT=y
  4 +CONFIG_SYS_MALLOC_F_LEN=0x2000
  5 +CONFIG_DEFAULT_DEVICE_TREE="at91sam9n12ek"
10 6 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_SPIFLASH"
11 7 CONFIG_BOOTDELAY=3
12 8 # CONFIG_CONSOLE_MUX is not set
13 9 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
14 10 # CONFIG_DISPLAY_BOARDINFO is not set
15   -CONFIG_SPL=y
16 11 CONFIG_HUSH_PARSER=y
17 12 CONFIG_SYS_PROMPT="U-Boot> "
18 13 CONFIG_CMD_BOOTZ=y
19 14  
20 15  
21 16  
... ... @@ -26,10 +21,25 @@
26 21 CONFIG_CMD_DHCP=y
27 22 CONFIG_CMD_PING=y
28 23 CONFIG_CMD_FAT=y
  24 +CONFIG_OF_CONTROL=y
  25 +CONFIG_DM=y
  26 +CONFIG_CLK=y
  27 +CONFIG_CLK_AT91=y
  28 +CONFIG_DM_GPIO=y
  29 +CONFIG_AT91_GPIO=y
  30 +CONFIG_DM_MMC=y
  31 +CONFIG_GENERIC_ATMEL_MCI=y
  32 +CONFIG_DM_SPI_FLASH=y
29 33 CONFIG_SPI_FLASH=y
30 34 CONFIG_SPI_FLASH_ATMEL=y
  35 +CONFIG_PINCTRL=y
  36 +CONFIG_PINCTRL_AT91=y
  37 +CONFIG_DM_SERIAL=y
  38 +CONFIG_ATMEL_USART=y
  39 +CONFIG_DM_SPI=y
  40 +CONFIG_ATMEL_SPI=y
31 41 CONFIG_USB=y
  42 +CONFIG_DM_USB=y
32 43 CONFIG_USB_STORAGE=y
33 44 CONFIG_LCD=y
34   -CONFIG_OF_LIBFDT=y
include/configs/at91sam9n12ek.h
Diff comments   View file @ 0ab5433
... ... @@ -28,14 +28,6 @@
28 28 #define CONFIG_INITRD_TAG
29 29 #define CONFIG_SKIP_LOWLEVEL_INIT
30 30  
31   -/* general purpose I/O */
32   -#define CONFIG_AT91_GPIO
33   -
34   -/* serial console */
35   -#define CONFIG_ATMEL_USART
36   -#define CONFIG_USART_BASE ATMEL_BASE_DBGU
37   -#define CONFIG_USART_ID ATMEL_ID_SYS
38   -
39 31 /* LCD */
40 32 #define LCD_BPP LCD_COLOR16
41 33 #define LCD_OUTPUT_BPP 24
... ... @@ -45,7 +37,6 @@
45 37 #define CONFIG_ATMEL_HLCD
46 38 #define CONFIG_ATMEL_LCD_RGB565
47 39  
48   -
49 40 /*
50 41 * BOOTP options
51 42 */
52 43  
53 44  
... ... @@ -69,14 +60,11 @@
69 60 * that address while providing maximum stack area below.
70 61 */
71 62 # define CONFIG_SYS_INIT_SP_ADDR \
72   - (ATMEL_BASE_SRAM + 0x1000 - GENERATED_GBL_DATA_SIZE)
  63 + (ATMEL_BASE_SRAM + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
73 64  
74 65 /* DataFlash */
75 66 #ifdef CONFIG_CMD_SF
76   -#define CONFIG_ATMEL_SPI
77 67 #define CONFIG_SF_DEFAULT_SPEED 30000000
78   -#define CONFIG_ENV_SPI_MODE SPI_MODE_3
79   -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3
80 68 #endif
81 69  
82 70 /* NAND flash */
... ... @@ -115,11 +103,6 @@
115 103 "bootargs_nand=rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw\0"\
116 104 "bootargs_mmc=root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait\0"
117 105  
118   -/* MMC */
119   -#ifdef CONFIG_CMD_MMC
120   -#define CONFIG_GENERIC_ATMEL_MCI
121   -#endif
122   -
123 106 /* Ethernet */
124 107 #define CONFIG_KS8851_MLL
125 108 #define CONFIG_KS8851_MLL_BASEADDR 0x30000000 /* use NCS2 */
... ... @@ -156,7 +139,7 @@
156 139  
157 140 /* bootstrap + u-boot + env + linux in nandflash */
158 141 #define CONFIG_ENV_IS_IN_NAND
159   -#define CONFIG_ENV_OFFSET 0xc0000
  142 +#define CONFIG_ENV_OFFSET 0x120000
160 143 #define CONFIG_ENV_OFFSET_REDUND 0x100000
161 144 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
162 145 #define CONFIG_BOOTCOMMAND \