Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 0cac0fb0221de34534e3344d058fe77c375980bb

Authored by Heiko Schocher
Committed by Tom Rini
1 parent efbfd448e5
Exists in smarc_8mq_lf_v2020.04 and in 9 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_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

at91: cleanup taurus port 

- at91sam9g20-taurus.dts: use labels
- cleanup taurus port to compile clean with
  current mainline again. SPL has no serial
  output anymore, so it fits into SRAM.

Signed-off-by: Heiko Schocher <hs@denx.de>

Showing 7 changed files with 213 additions and 131 deletions Side-by-side Diff

arch/arm/dts/at91sam9g20-taurus.dts
Diff comments   View file @ 0cac0fb
... ... @@ -15,7 +15,7 @@
15 15  
16 16 / {
17 17 model = "Siemens taurus";
18   - compatible = "atmel,at91sam9g20ek", "atmel,at91sam9g20", "atmel,at91sam9";
  18 + compatible = "atmel,at91sam9g20", "atmel,at91sam9";
19 19  
20 20 chosen {
21 21 u-boot,dm-pre-reloc;
22 22  
23 23  
24 24  
25 25  
26 26  
27 27  
28 28  
29 29  
30 30  
31 31  
32 32  
33 33  
34 34  
35 35  
... ... @@ -35,89 +35,87 @@
35 35 clock-frequency = <18432000>;
36 36 };
37 37 };
  38 +};
38 39  
39   - ahb {
40   - apb {
41   - pinctrl@fffff400 {
42   - board {
43   - pinctrl_pck0_as_mck: pck0_as_mck {
44   - atmel,pins =
45   - <AT91_PIOC 1 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC1 periph B */
46   - };
  40 +&dbgu {
  41 + status = "okay";
  42 +};
47 43  
48   - };
49   - };
  44 +&gpbr {
  45 + status = "okay";
  46 +};
50 47  
51   - dbgu: serial@fffff200 {
52   - u-boot,dm-pre-reloc;
53   - status = "okay";
54   - };
  48 +&macb0 {
  49 + phy-mode = "rmii";
  50 + status = "okay";
  51 +};
55 52  
56   - usart0: serial@fffb0000 {
57   - pinctrl-0 =
58   - <&pinctrl_usart0
59   - &pinctrl_usart0_rts
60   - &pinctrl_usart0_cts
61   - &pinctrl_usart0_dtr_dsr
62   - &pinctrl_usart0_dcd
63   - &pinctrl_usart0_ri>;
64   - status = "okay";
65   - };
  53 +&nand0 {
  54 + nand-bus-width = <8>;
  55 + nand-ecc-mode = "soft";
  56 + nand-on-flash-bbt;
  57 + status = "okay";
  58 +};
66 59  
67   - usart1: serial@fffb4000 {
68   - status = "okay";
69   - };
  60 +&pinctrl {
  61 + u-boot,dm-pre-reloc;
  62 + board {
  63 + pinctrl_pck0_as_mck: pck0_as_mck {
  64 + atmel,pins =
  65 + /* PC1 periph B */
  66 + <AT91_PIOC 1 AT91_PERIPH_B AT91_PINCTRL_NONE>;
  67 + };
70 68  
71   - macb0: ethernet@fffc4000 {
72   - phy-mode = "rmii";
73   - status = "okay";
74   - };
  69 + };
  70 +};
75 71  
76   - usb1: gadget@fffa4000 {
77   - atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
78   - status = "okay";
79   - };
  72 +&rtc {
  73 + atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
  74 + status = "okay";
  75 +};
80 76  
81   - ssc0: ssc@fffbc000 {
82   - status = "okay";
83   - pinctrl-0 = <&pinctrl_ssc0_tx>;
84   - };
  77 +&spi0 {
  78 + cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;
  79 + mtd_dataflash@0 {
  80 + compatible = "atmel,at45", "atmel,dataflash";
  81 + spi-max-frequency = <50000000>;
  82 + reg = <1>;
  83 + };
  84 +};
85 85  
86   - spi0: spi@fffc8000 {
87   - cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;
88   - mtd_dataflash@0 {
89   - compatible = "atmel,at45", "atmel,dataflash";
90   - spi-max-frequency = <50000000>;
91   - reg = <1>;
92   - };
93   - };
  86 +&ssc0 {
  87 + status = "okay";
  88 + pinctrl-0 = <&pinctrl_ssc0_tx>;
  89 +};
94 90  
95   - rtc@fffffd20 {
96   - atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
97   - status = "okay";
98   - };
  91 +&usart0 {
  92 + pinctrl-0 =
  93 + <&pinctrl_usart0
  94 + &pinctrl_usart0_rts
  95 + &pinctrl_usart0_cts
  96 + &pinctrl_usart0_dtr_dsr
  97 + &pinctrl_usart0_dcd
  98 + &pinctrl_usart0_ri>;
  99 + status = "okay";
  100 +};
99 101  
100   - watchdog@fffffd40 {
101   - timeout-sec = <15>;
102   - status = "okay";
103   - };
  102 +&usart1 {
  103 + status = "okay";
  104 +};
104 105  
105   - gpbr: syscon@fffffd50 {
106   - status = "okay";
107   - };
108   - };
  106 +&usb0 {
  107 + num-ports = <2>;
  108 + status = "okay";
  109 +};
109 110  
110   - nand0: nand@40000000 {
111   - nand-bus-width = <8>;
112   - nand-ecc-mode = "soft";
113   - nand-on-flash-bbt;
114   - status = "okay";
115   - };
  111 +&usb1 {
  112 + atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
  113 + status = "okay";
  114 +};
116 115  
117   - usb0: ohci@00500000 {
118   - num-ports = <2>;
119   - status = "okay";
120   - };
121   - };
  116 +&watchdog {
  117 + u-boot,dm-pre-reloc;
  118 + timeout-sec = <15>;
  119 + status = "okay";
122 120 };
board/siemens/taurus/Kconfig
Diff comments   View file @ 0cac0fb
... ... @@ -9,5 +9,21 @@
9 9 config SYS_CONFIG_NAME
10 10 default "taurus"
11 11  
  12 +choice
  13 + prompt "Board Type AXM/TAURUS"
  14 + default BOARD_AXM
  15 +
  16 +config BOARD_AXM
  17 + bool "AXM board type"
  18 + help
  19 + Select this, if you want to build for AXM board.
  20 +
  21 +config BOARD_TAURUS
  22 + bool "TAURUS board type"
  23 + help
  24 + Select this, if you want to build for TAURUS board.
  25 +
  26 +endchoice
  27 +
12 28 endif
board/siemens/taurus/taurus.c
Diff comments   View file @ 0cac0fb
... ... @@ -197,11 +197,11 @@
197 197  
198 198 /* Mirrors at A15 on ATMEL G20 SDRAM Controller with 64MB*/
199 199 if (ram_size == 0x800) {
200   - printf("\n\r 64MB");
  200 + printf("\n\r 64MB\n");
201 201 sdramc_configure(AT91_SDRAMC_NC_9);
202 202 } else {
203 203 /* Size already initialized */
204   - printf("\n\r 128MB");
  204 + printf("\n\r 128MB\n");
205 205 }
206 206 }
207 207 #endif
... ... @@ -282,24 +282,6 @@
282 282 return 0;
283 283 }
284 284  
285   -/* FIXME gpio code here need to handle through DM_GPIO */
286   -#ifndef CONFIG_DM_SPI
287   -int spi_cs_is_valid(unsigned int bus, unsigned int cs)
288   -{
289   - return bus == 0 && cs == 0;
290   -}
291   -
292   -void spi_cs_activate(struct spi_slave *slave)
293   -{
294   - at91_set_gpio_value(TAURUS_SPI_CS_PIN, 0);
295   -}
296   -
297   -void spi_cs_deactivate(struct spi_slave *slave)
298   -{
299   - at91_set_gpio_value(TAURUS_SPI_CS_PIN, 1);
300   -}
301   -#endif
302   -
303 285 #ifdef CONFIG_USB_GADGET_AT91
304 286 #include <linux/usb/at91_udc.h>
305 287  
... ... @@ -346,17 +328,6 @@
346 328 CONFIG_SYS_SDRAM_SIZE);
347 329 return 0;
348 330 }
349   -
350   -#ifndef CONFIG_DM_ETH
351   -int board_eth_init(bd_t *bis)
352   -{
353   - int rc = 0;
354   -#ifdef CONFIG_MACB
355   - rc = macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC0, 0x00);
356   -#endif
357   - return rc;
358   -}
359   -#endif
360 331  
361 332 #if !defined(CONFIG_SPL_BUILD)
362 333 #if defined(CONFIG_BOARD_AXM)
configs/axm_defconfig
Diff comments   View file @ 0cac0fb
1 1 CONFIG_ARM=y
2   -CONFIG_SPL_SYS_THUMB_BUILD=y
  2 +CONFIG_SYS_THUMB_BUILD=y
3 3 # CONFIG_SPL_USE_ARCH_MEMCPY is not set
4 4 # CONFIG_SPL_USE_ARCH_MEMSET is not set
5 5 CONFIG_ARCH_AT91=y
  6 +CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
6 7 CONFIG_SYS_TEXT_BASE=0x21000000
7 8 CONFIG_TARGET_TAURUS=y
8 9 CONFIG_SPL_GPIO_SUPPORT=y
9 10 CONFIG_SPL_LIBCOMMON_SUPPORT=y
10 11 CONFIG_SPL_LIBGENERIC_SUPPORT=y
11   -CONFIG_SPL_SERIAL_SUPPORT=y
  12 +CONFIG_SYS_MALLOC_F_LEN=0x2000
  13 +CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000
12 14 CONFIG_NR_DRAM_BANKS=1
13 15 CONFIG_SPL=y
  16 +CONFIG_DEBUG_UART_BASE=0xfffff200
  17 +CONFIG_DEBUG_UART_CLOCK=18432000
14 18 CONFIG_SPL_SPI_FLASH_SUPPORT=y
15 19 CONFIG_SPL_SPI_SUPPORT=y
16   -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2068,BOARD_AXM"
  20 +CONFIG_DEBUG_UART=y
  21 +CONFIG_TPL_SYS_MALLOC_F_LEN=0x1000
  22 +CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2068"
17 23 CONFIG_BOOTDELAY=3
18   -CONFIG_USE_BOOTARGS=y
19   -CONFIG_BOOTARGS="\0addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:${netdev}::off\0addtest=setenv bootargs ${bootargs} loglevel=4 test\0baudrate=115200\0boot_file=setenv bootfile /${project_dir}/kernel/uImage\0boot_retries=0\0bootcmd=run flash_self\0bootdelay=3\0ethact=macb0\0flash_nfs=run nand_kernel;run nfsargs;run addip;upgrade_available;bootm ${kernel_ram};reset\0flash_self=run nand_kernel;run setbootargs;upgrade_available;bootm ${kernel_ram};reset\0flash_self_test=run nand_kernel;run setbootargs addtest; upgrade_available;bootm ${kernel_ram};reset\0hostname=systemone\0kernel_Off=0x00200000\0kernel_Off_fallback=0x03800000\0kernel_ram=0x21500000\0kernel_size=0x00400000\0kernel_size_fallback=0x00400000\0loads_echo=1\0nand_kernel=nand read.e ${kernel_ram} ${kernel_Off} ${kernel_size}\0net_nfs=run boot_file;tftp ${kernel_ram} ${bootfile};run nfsargs;run addip;upgrade_available;bootm ${kernel_ram};reset\0netdev=eth0\0nfsargs=run root_path;setenv bootargs ${bootargs} root=/dev/nfs rw nfsroot=${serverip}:${rootpath} at91sam9_wdt.wdt_timeout=16\0partitionset_active=A\0preboot=echo;echo Type 'run flash_self' to use kernel and root filesystem on memory;echo Type 'run flash_nfs' to use kernel from memory and root filesystem over NFS;echo Type 'run net_nfs' to get Kernel over TFTP and mount root filesystem over NFS;echo\0project_dir=systemone\0root_path=setenv rootpath /home/projects/${project_dir}/rootfs\0rootfs=/dev/mtdblock5\0rootfs_fallback=/dev/mtdblock7\0setbootargs=setenv bootargs ${bootargs} console=ttyMTD,mtdoops root=${rootfs} rootfstype=jffs2 panic=7 at91sam9_wdt.wdt_timeout=16\0stderr=serial\0stdin=serial\0stdout=serial\0upgrade_available=0\0"
  24 +CONFIG_USE_BOOTCOMMAND=y
  25 +CONFIG_BOOTCOMMAND="run flash_self"
20 26 # CONFIG_DISPLAY_BOARDINFO is not set
21 27 CONFIG_BOARD_EARLY_INIT_F=y
  28 +# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
  29 +CONFIG_SPL_SYS_MALLOC_SIMPLE=y
  30 +# CONFIG_TPL_BANNER_PRINT is not set
  31 +CONFIG_SPL_CRC32_SUPPORT=y
22 32 CONFIG_SPL_NAND_SUPPORT=y
23   -CONFIG_SPL_SPI_LOAD=y
24 33 CONFIG_HUSH_PARSER=y
  34 +CONFIG_SYS_PROMPT="U-Boot> "
25 35 # CONFIG_CMD_BDI is not set
26 36 CONFIG_CMD_BOOTZ=y
27 37 # CONFIG_CMD_IMI is not set
28 38 # CONFIG_CMD_LOADS is not set
29 39 CONFIG_CMD_NAND=y
  40 +# CONFIG_CMD_PINMUX is not set
30 41 CONFIG_CMD_SF=y
31 42 CONFIG_CMD_SPI=y
32 43 # CONFIG_CMD_SOURCE is not set
33 44 # CONFIG_CMD_SETEXPR is not set
34 45 CONFIG_CMD_DHCP=y
35 46 CONFIG_CMD_PING=y
  47 +CONFIG_CMD_MTDPARTS=y
36 48 CONFIG_OF_CONTROL=y
37   -CONFIG_OF_EMBED=y
  49 +CONFIG_SPL_OF_CONTROL=y
38 50 CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20-taurus"
  51 +CONFIG_SPL_OF_PLATDATA=y
39 52 CONFIG_ENV_IS_IN_NAND=y
  53 +CONFIG_SPL_DM=y
  54 +CONFIG_BLK=y
  55 +CONFIG_HAVE_BLOCK_DEVICE=y
  56 +CONFIG_CLK=y
  57 +CONFIG_CLK_AT91=y
40 58 # CONFIG_MMC is not set
41 59 CONFIG_NAND=y
42 60 CONFIG_NAND_ATMEL=y
  61 +CONFIG_DM_SPI_FLASH=y
43 62 CONFIG_SPI_FLASH=y
44 63 CONFIG_SPI_FLASH_STMICRO=y
45 64 CONFIG_PHYLIB=y
  65 +CONFIG_PINCTRL=y
  66 +CONFIG_PINCTRL_AT91=y
  67 +CONFIG_SPECIFY_CONSOLE_INDEX=y
  68 +CONFIG_DEBUG_UART_ATMEL=y
  69 +CONFIG_ATMEL_USART=y
  70 +CONFIG_WDT=y
  71 +CONFIG_WDT_AT91=y
46 72 CONFIG_USE_TINY_PRINTF=y
  73 +CONFIG_HEXDUMP=y
  74 +# CONFIG_EFI_LOADER is not set
configs/taurus_defconfig
Diff comments   View file @ 0cac0fb
1 1 CONFIG_ARM=y
2   -CONFIG_SPL_SYS_THUMB_BUILD=y
  2 +CONFIG_SYS_THUMB_BUILD=y
3 3 # CONFIG_SPL_USE_ARCH_MEMCPY is not set
4 4 # CONFIG_SPL_USE_ARCH_MEMSET is not set
5 5 CONFIG_ARCH_AT91=y
6 6 CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
7 7 CONFIG_SYS_TEXT_BASE=0x21000000
8 8 CONFIG_TARGET_TAURUS=y
  9 +CONFIG_BOARD_TAURUS=y
9 10 CONFIG_SPL_GPIO_SUPPORT=y
10 11 CONFIG_SPL_LIBCOMMON_SUPPORT=y
11 12 CONFIG_SPL_LIBGENERIC_SUPPORT=y
12   -CONFIG_SYS_MALLOC_F_LEN=0x1000
13   -CONFIG_SPL_SERIAL_SUPPORT=y
  13 +CONFIG_SYS_MALLOC_F_LEN=0x2000
  14 +CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000
14 15 CONFIG_NR_DRAM_BANKS=1
15 16 CONFIG_SPL=y
  17 +CONFIG_DEBUG_UART_BASE=0xfffff200
  18 +CONFIG_DEBUG_UART_CLOCK=18432000
16 19 CONFIG_SPL_SPI_FLASH_SUPPORT=y
17 20 CONFIG_SPL_SPI_SUPPORT=y
18   -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2067,BOARD_TAURUS"
  21 +CONFIG_DEBUG_UART=y
  22 +CONFIG_TPL_SYS_MALLOC_F_LEN=0x1000
  23 +CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2067"
19 24 CONFIG_BOOTDELAY=3
20 25 CONFIG_USE_BOOTARGS=y
21 26 CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
  27 +CONFIG_USE_BOOTCOMMAND=y
  28 +CONFIG_BOOTCOMMAND="nand read 0x22000000 0x200000 0x300000; bootm"
22 29 # CONFIG_DISPLAY_BOARDINFO is not set
23 30 CONFIG_BOARD_EARLY_INIT_F=y
  31 +# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
  32 +CONFIG_SPL_SYS_MALLOC_SIMPLE=y
  33 +# CONFIG_TPL_BANNER_PRINT is not set
  34 +CONFIG_SPL_CRC32_SUPPORT=y
24 35 CONFIG_SPL_NAND_SUPPORT=y
25   -CONFIG_SPL_SPI_LOAD=y
26 36 CONFIG_HUSH_PARSER=y
27 37 CONFIG_SYS_PROMPT="U-Boot> "
  38 +CONFIG_SYS_XTRACE="n"
28 39 # CONFIG_CMD_BDI is not set
29 40 CONFIG_CMD_BOOTZ=y
30 41 # CONFIG_CMD_IMI is not set
31 42 CONFIG_CMD_DFU=y
32 43 # CONFIG_CMD_LOADS is not set
33 44 CONFIG_CMD_NAND=y
  45 +# CONFIG_CMD_PINMUX is not set
34 46 CONFIG_CMD_SF=y
35 47 CONFIG_CMD_SPI=y
36 48 CONFIG_CMD_USB=y
37 49  
38 50  
39 51  
40 52  
41 53  
... ... @@ -41,19 +53,30 @@
41 53 CONFIG_CMD_MTDPARTS=y
42 54 # CONFIG_DOS_PARTITION is not set
43 55 CONFIG_OF_CONTROL=y
44   -CONFIG_OF_EMBED=y
  56 +CONFIG_SPL_OF_CONTROL=y
45 57 CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20-taurus"
  58 +CONFIG_SPL_OF_PLATDATA=y
46 59 CONFIG_ENV_IS_IN_NAND=y
  60 +CONFIG_SPL_DM=y
  61 +CONFIG_BLK=y
47 62 CONFIG_CLK=y
48 63 CONFIG_CLK_AT91=y
49 64 CONFIG_DFU_NAND=y
50 65 # CONFIG_MMC is not set
51 66 CONFIG_NAND=y
52 67 CONFIG_NAND_ATMEL=y
  68 +CONFIG_DM_SPI_FLASH=y
53 69 CONFIG_SPI_FLASH=y
54 70 CONFIG_SPI_FLASH_STMICRO=y
55 71 CONFIG_PHYLIB=y
  72 +CONFIG_PINCTRL=y
  73 +CONFIG_PINCTRL_AT91=y
  74 +CONFIG_SPECIFY_CONSOLE_INDEX=y
  75 +CONFIG_DEBUG_UART_ATMEL=y
  76 +CONFIG_ATMEL_USART=y
56 77 CONFIG_USB=y
  78 +CONFIG_DM_USB=y
  79 +# CONFIG_SPL_DM_USB is not set
57 80 CONFIG_USB_STORAGE=y
58 81 CONFIG_USB_GADGET=y
59 82 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
... ... @@ -63,4 +86,6 @@
63 86 CONFIG_WDT=y
64 87 CONFIG_WDT_AT91=y
65 88 CONFIG_USE_TINY_PRINTF=y
  89 +CONFIG_HEXDUMP=y
  90 +# CONFIG_EFI_LOADER is not set
include/configs/taurus.h
Diff comments   View file @ 0cac0fb
... ... @@ -41,6 +41,7 @@
41 41 #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
42 42 #define CONFIG_SETUP_MEMORY_TAGS
43 43 #define CONFIG_INITRD_TAG
  44 +
44 45 #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
45 46  
46 47 /* general purpose I/O */
47 48  
... ... @@ -48,12 +49,9 @@
48 49 #define CONFIG_AT91_GPIO
49 50 #define CONFIG_AT91_GPIO_PULLUP 1 /* keep pullups on peripheral pins */
50 51  
51   -/* serial console */
52   -#define CONFIG_ATMEL_USART
53 52 #define CONFIG_USART_BASE ATMEL_BASE_DBGU
54 53 #define CONFIG_USART_ID ATMEL_ID_SYS
55 54  
56   -
57 55 /*
58 56 * SDRAM: 1 bank, min 32, max 128 MB
59 57 * Initialized before u-boot gets started.
... ... @@ -106,7 +104,6 @@
106 104  
107 105 /* SPI EEPROM */
108 106 #define TAURUS_SPI_MASK (1 << 4)
109   -#define TAURUS_SPI_CS_PIN AT91_PIN_PA3
110 107  
111 108 #if defined(CONFIG_SPL_BUILD)
112 109 /* SPL related */
113 110  
... ... @@ -120,8 +117,57 @@
120 117 #define CONFIG_ENV_OFFSET 0x100000
121 118 #define CONFIG_ENV_OFFSET_REDUND 0x180000
122 119 #define CONFIG_ENV_SIZE (SZ_128K) /* 1 sector = 128 kB */
123   -#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm"
124 120  
  121 +#ifndef CONFIG_SPL_BUILD
  122 +#if defined(CONFIG_BOARD_AXM)
  123 +#define CONFIG_EXTRA_ENV_SETTINGS \
  124 + "addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \
  125 + "${gatewayip}:${netmask}:${hostname}:${netdev}::off\0" \
  126 + "addtest=setenv bootargs ${bootargs} loglevel=4 test\0" \
  127 + "boot_file=setenv bootfile /${project_dir}/kernel/uImage\0" \
  128 + "boot_retries=0\0" \
  129 + "ethact=macb0\0" \
  130 + "flash_nfs=run nand_kernel;run nfsargs;run addip;" \
  131 + "upgrade_available;bootm ${kernel_ram};reset\0" \
  132 + "flash_self=run nand_kernel;run setbootargs;upgrade_available;" \
  133 + "bootm ${kernel_ram};reset\0" \
  134 + "flash_self_test=run nand_kernel;run setbootargs addtest;" \
  135 + "upgrade_available;bootm ${kernel_ram};reset\0" \
  136 + "hostname=systemone\0" \
  137 + "kernel_Off=0x00200000\0" \
  138 + "kernel_Off_fallback=0x03800000\0" \
  139 + "kernel_ram=0x21500000\0" \
  140 + "kernel_size=0x00400000\0" \
  141 + "kernel_size_fallback=0x00400000\0" \
  142 + "loads_echo=1\0" \
  143 + "nand_kernel=nand read.e ${kernel_ram} ${kernel_Off} " \
  144 + "${kernel_size}\0" \
  145 + "net_nfs=run boot_file;tftp ${kernel_ram} ${bootfile};" \
  146 + "run nfsargs;run addip;upgrade_available;" \
  147 + "bootm ${kernel_ram};reset\0" \
  148 + "netdev=eth0\0" \
  149 + "nfsargs=run root_path;setenv bootargs ${bootargs} root=/dev/nfs " \
  150 + "rw nfsroot=${serverip}:${rootpath} " \
  151 + "at91sam9_wdt.wdt_timeout=16\0" \
  152 + "partitionset_active=A\0" \
  153 + "preboot=echo;echo Type 'run flash_self' to use kernel and root " \
  154 + "filesystem on memory;echo Type 'run flash_nfs' to use " \
  155 + "kernel from memory and root filesystem over NFS;echo Type " \
  156 + "'run net_nfs' to get Kernel over TFTP and mount root " \
  157 + "filesystem over NFS;echo\0" \
  158 + "project_dir=systemone\0" \
  159 + "root_path=setenv rootpath /home/projects/${project_dir}/rootfs\0" \
  160 + "rootfs=/dev/mtdblock5\0" \
  161 + "rootfs_fallback=/dev/mtdblock7\0" \
  162 + "setbootargs=setenv bootargs ${bootargs} console=ttyMTD,mtdoops " \
  163 + "root=${rootfs} rootfstype=jffs2 panic=7 " \
  164 + "at91sam9_wdt.wdt_timeout=16\0" \
  165 + "stderr=serial\0" \
  166 + "stdin=serial\0" \
  167 + "stdout=serial\0" \
  168 + "upgrade_available=0\0"
  169 +#endif
  170 +#endif /* #ifndef CONFIG_SPL_BUILD */
125 171 /*
126 172 * Size of malloc() pool
127 173 */
scripts/config_whitelist.txt
Diff comments   View file @ 0cac0fb
... ... @@ -118,7 +118,6 @@
118 118 CONFIG_BOARDDIR
119 119 CONFIG_BOARDNAME
120 120 CONFIG_BOARDNAME_LOCAL
121   -CONFIG_BOARD_AXM
122 121 CONFIG_BOARD_COMMON
123 122 CONFIG_BOARD_ECC_SUPPORT
124 123 CONFIG_BOARD_IS_OPENRD_BASE
... ... @@ -128,7 +127,6 @@
128 127 CONFIG_BOARD_POSTCLK_INIT
129 128 CONFIG_BOARD_REVISION_TAG
130 129 CONFIG_BOARD_SIZE_LIMIT
131   -CONFIG_BOARD_TAURUS
132 130 CONFIG_BOOGER
133 131 CONFIG_BOOTBLOCK
134 132 CONFIG_BOOTFILE