Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 59b37122b10b1d5d1d8c2b6833cc1075e7275892

Authored by Wenyou Yang
Committed by Simon Glass
1 parent c1868adf64
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: at91sam9m10g45ek: Update to support DM/DT 

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 4 changed files with 41 additions and 46 deletions Side-by-side Diff

board/atmel/at91sam9m10g45ek/Makefile
Diff comments   View file @ 59b3712
... ... @@ -10,5 +10,5 @@
10 10 #
11 11  
12 12 obj-y += at91sam9m10g45ek.o
13   -obj-y += led.o
  13 +obj-(CONFIG_AT91_LED) += led.o
configs/at91sam9m10g45ek_mmc_defconfig
Diff comments   View file @ 59b3712
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_AT91=y
3 3 CONFIG_TARGET_AT91SAM9M10G45EK=y
4   -CONFIG_SPL_GPIO_SUPPORT=y
5   -CONFIG_SPL_LIBCOMMON_SUPPORT=y
6   -CONFIG_SPL_LIBGENERIC_SUPPORT=y
7   -CONFIG_SPL_MMC_SUPPORT=y
8   -CONFIG_SPL_SERIAL_SUPPORT=y
9   -CONFIG_SPL_LIBDISK_SUPPORT=y
10   -CONFIG_SPL_FAT_SUPPORT=y
  4 +CONFIG_SYS_MALLOC_F_LEN=0x2000
  5 +CONFIG_DEFAULT_DEVICE_TREE="at91sam9m10g45ek"
11 6 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC"
12 7 CONFIG_BOOTDELAY=3
13 8 # CONFIG_CONSOLE_MUX is not set
14 9 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
15 10 # CONFIG_DISPLAY_BOARDINFO is not set
16   -CONFIG_SPL=y
17 11 CONFIG_HUSH_PARSER=y
18 12 CONFIG_SYS_PROMPT="U-Boot> "
19 13 # CONFIG_CMD_BDI is not set
20 14  
21 15  
... ... @@ -29,8 +23,24 @@
29 23 CONFIG_CMD_DHCP=y
30 24 CONFIG_CMD_PING=y
31 25 CONFIG_CMD_FAT=y
  26 +CONFIG_OF_CONTROL=y
  27 +CONFIG_DM=y
  28 +CONFIG_CLK=y
  29 +CONFIG_CLK_AT91=y
  30 +CONFIG_AT91_UTMI=y
  31 +CONFIG_DM_GPIO=y
  32 +CONFIG_AT91_GPIO=y
  33 +CONFIG_DM_MMC=y
  34 +CONFIG_GENERIC_ATMEL_MCI=y
  35 +CONFIG_DM_ETH=y
  36 +CONFIG_MACB=y
  37 +CONFIG_PINCTRL=y
  38 +CONFIG_PINCTRL_AT91=y
  39 +CONFIG_DM_SERIAL=y
  40 +CONFIG_ATMEL_USART=y
32 41 CONFIG_USB=y
  42 +CONFIG_DM_USB=y
  43 +CONFIG_USB_EHCI_HCD=y
33 44 CONFIG_USB_STORAGE=y
34 45 CONFIG_LCD=y
35   -CONFIG_OF_LIBFDT=y
configs/at91sam9m10g45ek_nandflash_defconfig
Diff comments   View file @ 59b3712
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_AT91=y
3 3 CONFIG_TARGET_AT91SAM9M10G45EK=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="at91sam9m10g45ek"
9 6 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,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_BDI is not set
18 14  
19 15  
... ... @@ -27,8 +23,24 @@
27 23 CONFIG_CMD_DHCP=y
28 24 CONFIG_CMD_PING=y
29 25 CONFIG_CMD_FAT=y
  26 +CONFIG_OF_CONTROL=y
  27 +CONFIG_DM=y
  28 +CONFIG_CLK=y
  29 +CONFIG_CLK_AT91=y
  30 +CONFIG_AT91_UTMI=y
  31 +CONFIG_DM_GPIO=y
  32 +CONFIG_AT91_GPIO=y
  33 +CONFIG_DM_MMC=y
  34 +CONFIG_GENERIC_ATMEL_MCI=y
  35 +CONFIG_DM_ETH=y
  36 +CONFIG_MACB=y
  37 +CONFIG_PINCTRL=y
  38 +CONFIG_PINCTRL_AT91=y
  39 +CONFIG_DM_SERIAL=y
  40 +CONFIG_ATMEL_USART=y
30 41 CONFIG_USB=y
  42 +CONFIG_DM_USB=y
  43 +CONFIG_USB_EHCI_HCD=y
31 44 CONFIG_USB_STORAGE=y
32 45 CONFIG_LCD=y
33   -CONFIG_OF_LIBFDT=y
include/configs/at91sam9m10g45ek.h
Diff comments   View file @ 59b3712
... ... @@ -30,14 +30,7 @@
30 30  
31 31 /* general purpose I/O */
32 32 #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
33   -#define CONFIG_AT91_GPIO
34   -#define CONFIG_AT91_GPIO_PULLUP 1 /* keep pullups on peripheral pins */
35 33  
36   -/* serial console */
37   -#define CONFIG_ATMEL_USART
38   -#define CONFIG_USART_BASE ATMEL_BASE_DBGU
39   -#define CONFIG_USART_ID ATMEL_ID_SYS
40   -
41 34 /* LCD */
42 35 #define LCD_BPP LCD_COLOR8
43 36 #define CONFIG_LCD_LOGO
... ... @@ -49,12 +42,6 @@
49 42 /* board specific(not enough SRAM) */
50 43 #define CONFIG_AT91SAM9G45_LCD_BASE 0x73E00000
51 44  
52   -/* LED */
53   -#define CONFIG_AT91_LED
54   -#define CONFIG_RED_LED AT91_PIN_PD31 /* this is the user1 led */
55   -#define CONFIG_GREEN_LED AT91_PIN_PD0 /* this is the user2 led */
56   -
57   -
58 45 /*
59 46 * BOOTP options
60 47 */
... ... @@ -75,7 +62,7 @@
75 62 #define CONFIG_SYS_SDRAM_SIZE 0x08000000
76 63  
77 64 #define CONFIG_SYS_INIT_SP_ADDR \
78   - (CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE)
  65 + (CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
79 66  
80 67 /* NAND flash */
81 68 #ifdef CONFIG_CMD_NAND
82 69  
83 70  
... ... @@ -92,24 +79,10 @@
92 79  
93 80 #endif
94 81  
95   -/* MMC */
96   -
97   -#ifdef CONFIG_CMD_MMC
98   -#define CONFIG_GENERIC_ATMEL_MCI
99   -#endif
100   -
101 82 /* Ethernet */
102   -#define CONFIG_MACB
103   -#define CONFIG_RMII
104   -#define CONFIG_NET_RETRY_COUNT 20
105 83 #define CONFIG_RESET_PHY_R
106 84 #define CONFIG_AT91_WANTS_COMMON_PHY
107 85  
108   -/* USB */
109   -#define CONFIG_USB_EHCI
110   -#define CONFIG_USB_EHCI_ATMEL
111   -#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
112   -
113 86 #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */
114 87  
115 88 #define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
... ... @@ -118,7 +91,7 @@
118 91 #ifdef CONFIG_SYS_USE_NANDFLASH
119 92 /* bootstrap + u-boot + env in nandflash */
120 93 #define CONFIG_ENV_IS_IN_NAND
121   -#define CONFIG_ENV_OFFSET 0xc0000
  94 +#define CONFIG_ENV_OFFSET 0x120000
122 95 #define CONFIG_ENV_OFFSET_REDUND 0x100000
123 96 #define CONFIG_ENV_SIZE 0x20000
124 97