mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
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>
This commit is contained in:
Heiko Schocher
Tom Rini
parent
efbfd448e5
commit
0cac0fb022
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
/ {
|
||||
model = "Siemens taurus";
|
||||
compatible = "atmel,at91sam9g20ek", "atmel,at91sam9g20", "atmel,at91sam9";
|
||||
compatible = "atmel,at91sam9g20", "atmel,at91sam9";
|
||||
|
||||
chosen {
|
||||
u-boot,dm-pre-reloc;
|
||||
|
|
@ -35,88 +35,86 @@
|
|||
clock-frequency = <18432000>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
ahb {
|
||||
apb {
|
||||
pinctrl@fffff400 {
|
||||
board {
|
||||
pinctrl_pck0_as_mck: pck0_as_mck {
|
||||
atmel,pins =
|
||||
<AT91_PIOC 1 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC1 periph B */
|
||||
};
|
||||
&dbgu {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
&gpbr {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
dbgu: serial@fffff200 {
|
||||
u-boot,dm-pre-reloc;
|
||||
status = "okay";
|
||||
};
|
||||
&macb0 {
|
||||
phy-mode = "rmii";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
usart0: serial@fffb0000 {
|
||||
pinctrl-0 =
|
||||
<&pinctrl_usart0
|
||||
&pinctrl_usart0_rts
|
||||
&pinctrl_usart0_cts
|
||||
&pinctrl_usart0_dtr_dsr
|
||||
&pinctrl_usart0_dcd
|
||||
&pinctrl_usart0_ri>;
|
||||
status = "okay";
|
||||
};
|
||||
&nand0 {
|
||||
nand-bus-width = <8>;
|
||||
nand-ecc-mode = "soft";
|
||||
nand-on-flash-bbt;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
usart1: serial@fffb4000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
macb0: ethernet@fffc4000 {
|
||||
phy-mode = "rmii";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
usb1: gadget@fffa4000 {
|
||||
atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
ssc0: ssc@fffbc000 {
|
||||
status = "okay";
|
||||
pinctrl-0 = <&pinctrl_ssc0_tx>;
|
||||
};
|
||||
|
||||
spi0: spi@fffc8000 {
|
||||
cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;
|
||||
mtd_dataflash@0 {
|
||||
compatible = "atmel,at45", "atmel,dataflash";
|
||||
spi-max-frequency = <50000000>;
|
||||
reg = <1>;
|
||||
};
|
||||
};
|
||||
|
||||
rtc@fffffd20 {
|
||||
atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
watchdog@fffffd40 {
|
||||
timeout-sec = <15>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
gpbr: syscon@fffffd50 {
|
||||
status = "okay";
|
||||
};
|
||||
&pinctrl {
|
||||
u-boot,dm-pre-reloc;
|
||||
board {
|
||||
pinctrl_pck0_as_mck: pck0_as_mck {
|
||||
atmel,pins =
|
||||
/* PC1 periph B */
|
||||
<AT91_PIOC 1 AT91_PERIPH_B AT91_PINCTRL_NONE>;
|
||||
};
|
||||
|
||||
nand0: nand@40000000 {
|
||||
nand-bus-width = <8>;
|
||||
nand-ecc-mode = "soft";
|
||||
nand-on-flash-bbt;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
usb0: ohci@00500000 {
|
||||
num-ports = <2>;
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&rtc {
|
||||
atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi0 {
|
||||
cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;
|
||||
mtd_dataflash@0 {
|
||||
compatible = "atmel,at45", "atmel,dataflash";
|
||||
spi-max-frequency = <50000000>;
|
||||
reg = <1>;
|
||||
};
|
||||
};
|
||||
|
||||
&ssc0 {
|
||||
status = "okay";
|
||||
pinctrl-0 = <&pinctrl_ssc0_tx>;
|
||||
};
|
||||
|
||||
&usart0 {
|
||||
pinctrl-0 =
|
||||
<&pinctrl_usart0
|
||||
&pinctrl_usart0_rts
|
||||
&pinctrl_usart0_cts
|
||||
&pinctrl_usart0_dtr_dsr
|
||||
&pinctrl_usart0_dcd
|
||||
&pinctrl_usart0_ri>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usart1 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb0 {
|
||||
num-ports = <2>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb1 {
|
||||
atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&watchdog {
|
||||
u-boot,dm-pre-reloc;
|
||||
timeout-sec = <15>;
|
||||
status = "okay";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,4 +9,20 @@ config SYS_VENDOR
|
|||
config SYS_CONFIG_NAME
|
||||
default "taurus"
|
||||
|
||||
choice
|
||||
prompt "Board Type AXM/TAURUS"
|
||||
default BOARD_AXM
|
||||
|
||||
config BOARD_AXM
|
||||
bool "AXM board type"
|
||||
help
|
||||
Select this, if you want to build for AXM board.
|
||||
|
||||
config BOARD_TAURUS
|
||||
bool "TAURUS board type"
|
||||
help
|
||||
Select this, if you want to build for TAURUS board.
|
||||
|
||||
endchoice
|
||||
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -197,11 +197,11 @@ void mem_init(void)
|
|||
|
||||
/* Mirrors at A15 on ATMEL G20 SDRAM Controller with 64MB*/
|
||||
if (ram_size == 0x800) {
|
||||
printf("\n\r 64MB");
|
||||
printf("\n\r 64MB\n");
|
||||
sdramc_configure(AT91_SDRAMC_NC_9);
|
||||
} else {
|
||||
/* Size already initialized */
|
||||
printf("\n\r 128MB");
|
||||
printf("\n\r 128MB\n");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
@ -282,24 +282,6 @@ int board_early_init_f(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* FIXME gpio code here need to handle through DM_GPIO */
|
||||
#ifndef CONFIG_DM_SPI
|
||||
int spi_cs_is_valid(unsigned int bus, unsigned int cs)
|
||||
{
|
||||
return bus == 0 && cs == 0;
|
||||
}
|
||||
|
||||
void spi_cs_activate(struct spi_slave *slave)
|
||||
{
|
||||
at91_set_gpio_value(TAURUS_SPI_CS_PIN, 0);
|
||||
}
|
||||
|
||||
void spi_cs_deactivate(struct spi_slave *slave)
|
||||
{
|
||||
at91_set_gpio_value(TAURUS_SPI_CS_PIN, 1);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_USB_GADGET_AT91
|
||||
#include <linux/usb/at91_udc.h>
|
||||
|
||||
|
|
@ -347,17 +329,6 @@ int dram_init(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifndef CONFIG_DM_ETH
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
int rc = 0;
|
||||
#ifdef CONFIG_MACB
|
||||
rc = macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC0, 0x00);
|
||||
#endif
|
||||
return rc;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if !defined(CONFIG_SPL_BUILD)
|
||||
#if defined(CONFIG_BOARD_AXM)
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,46 +1,74 @@
|
|||
CONFIG_ARM=y
|
||||
CONFIG_SPL_SYS_THUMB_BUILD=y
|
||||
CONFIG_SYS_THUMB_BUILD=y
|
||||
# CONFIG_SPL_USE_ARCH_MEMCPY is not set
|
||||
# CONFIG_SPL_USE_ARCH_MEMSET is not set
|
||||
CONFIG_ARCH_AT91=y
|
||||
CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
|
||||
CONFIG_SYS_TEXT_BASE=0x21000000
|
||||
CONFIG_TARGET_TAURUS=y
|
||||
CONFIG_SPL_GPIO_SUPPORT=y
|
||||
CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
||||
CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
||||
CONFIG_SPL_SERIAL_SUPPORT=y
|
||||
CONFIG_SYS_MALLOC_F_LEN=0x2000
|
||||
CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_SPL=y
|
||||
CONFIG_DEBUG_UART_BASE=0xfffff200
|
||||
CONFIG_DEBUG_UART_CLOCK=18432000
|
||||
CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
CONFIG_SPL_SPI_SUPPORT=y
|
||||
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2068,BOARD_AXM"
|
||||
CONFIG_DEBUG_UART=y
|
||||
CONFIG_TPL_SYS_MALLOC_F_LEN=0x1000
|
||||
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2068"
|
||||
CONFIG_BOOTDELAY=3
|
||||
CONFIG_USE_BOOTARGS=y
|
||||
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"
|
||||
CONFIG_USE_BOOTCOMMAND=y
|
||||
CONFIG_BOOTCOMMAND="run flash_self"
|
||||
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||
CONFIG_BOARD_EARLY_INIT_F=y
|
||||
# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
|
||||
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
|
||||
# CONFIG_TPL_BANNER_PRINT is not set
|
||||
CONFIG_SPL_CRC32_SUPPORT=y
|
||||
CONFIG_SPL_NAND_SUPPORT=y
|
||||
CONFIG_SPL_SPI_LOAD=y
|
||||
CONFIG_HUSH_PARSER=y
|
||||
CONFIG_SYS_PROMPT="U-Boot> "
|
||||
# CONFIG_CMD_BDI is not set
|
||||
CONFIG_CMD_BOOTZ=y
|
||||
# CONFIG_CMD_IMI is not set
|
||||
# CONFIG_CMD_LOADS is not set
|
||||
CONFIG_CMD_NAND=y
|
||||
# CONFIG_CMD_PINMUX is not set
|
||||
CONFIG_CMD_SF=y
|
||||
CONFIG_CMD_SPI=y
|
||||
# CONFIG_CMD_SOURCE is not set
|
||||
# CONFIG_CMD_SETEXPR is not set
|
||||
CONFIG_CMD_DHCP=y
|
||||
CONFIG_CMD_PING=y
|
||||
CONFIG_CMD_MTDPARTS=y
|
||||
CONFIG_OF_CONTROL=y
|
||||
CONFIG_OF_EMBED=y
|
||||
CONFIG_SPL_OF_CONTROL=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20-taurus"
|
||||
CONFIG_SPL_OF_PLATDATA=y
|
||||
CONFIG_ENV_IS_IN_NAND=y
|
||||
CONFIG_SPL_DM=y
|
||||
CONFIG_BLK=y
|
||||
CONFIG_HAVE_BLOCK_DEVICE=y
|
||||
CONFIG_CLK=y
|
||||
CONFIG_CLK_AT91=y
|
||||
# CONFIG_MMC is not set
|
||||
CONFIG_NAND=y
|
||||
CONFIG_NAND_ATMEL=y
|
||||
CONFIG_DM_SPI_FLASH=y
|
||||
CONFIG_SPI_FLASH=y
|
||||
CONFIG_SPI_FLASH_STMICRO=y
|
||||
CONFIG_PHYLIB=y
|
||||
CONFIG_PINCTRL=y
|
||||
CONFIG_PINCTRL_AT91=y
|
||||
CONFIG_SPECIFY_CONSOLE_INDEX=y
|
||||
CONFIG_DEBUG_UART_ATMEL=y
|
||||
CONFIG_ATMEL_USART=y
|
||||
CONFIG_WDT=y
|
||||
CONFIG_WDT_AT91=y
|
||||
CONFIG_USE_TINY_PRINTF=y
|
||||
CONFIG_HEXDUMP=y
|
||||
# CONFIG_EFI_LOADER is not set
|
||||
|
|
|
|||
|
|
@ -1,36 +1,48 @@
|
|||
CONFIG_ARM=y
|
||||
CONFIG_SPL_SYS_THUMB_BUILD=y
|
||||
CONFIG_SYS_THUMB_BUILD=y
|
||||
# CONFIG_SPL_USE_ARCH_MEMCPY is not set
|
||||
# CONFIG_SPL_USE_ARCH_MEMSET is not set
|
||||
CONFIG_ARCH_AT91=y
|
||||
CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
|
||||
CONFIG_SYS_TEXT_BASE=0x21000000
|
||||
CONFIG_TARGET_TAURUS=y
|
||||
CONFIG_BOARD_TAURUS=y
|
||||
CONFIG_SPL_GPIO_SUPPORT=y
|
||||
CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
||||
CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
||||
CONFIG_SYS_MALLOC_F_LEN=0x1000
|
||||
CONFIG_SPL_SERIAL_SUPPORT=y
|
||||
CONFIG_SYS_MALLOC_F_LEN=0x2000
|
||||
CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_SPL=y
|
||||
CONFIG_DEBUG_UART_BASE=0xfffff200
|
||||
CONFIG_DEBUG_UART_CLOCK=18432000
|
||||
CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
CONFIG_SPL_SPI_SUPPORT=y
|
||||
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2067,BOARD_TAURUS"
|
||||
CONFIG_DEBUG_UART=y
|
||||
CONFIG_TPL_SYS_MALLOC_F_LEN=0x1000
|
||||
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2067"
|
||||
CONFIG_BOOTDELAY=3
|
||||
CONFIG_USE_BOOTARGS=y
|
||||
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"
|
||||
CONFIG_USE_BOOTCOMMAND=y
|
||||
CONFIG_BOOTCOMMAND="nand read 0x22000000 0x200000 0x300000; bootm"
|
||||
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||
CONFIG_BOARD_EARLY_INIT_F=y
|
||||
# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
|
||||
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
|
||||
# CONFIG_TPL_BANNER_PRINT is not set
|
||||
CONFIG_SPL_CRC32_SUPPORT=y
|
||||
CONFIG_SPL_NAND_SUPPORT=y
|
||||
CONFIG_SPL_SPI_LOAD=y
|
||||
CONFIG_HUSH_PARSER=y
|
||||
CONFIG_SYS_PROMPT="U-Boot> "
|
||||
CONFIG_SYS_XTRACE="n"
|
||||
# CONFIG_CMD_BDI is not set
|
||||
CONFIG_CMD_BOOTZ=y
|
||||
# CONFIG_CMD_IMI is not set
|
||||
CONFIG_CMD_DFU=y
|
||||
# CONFIG_CMD_LOADS is not set
|
||||
CONFIG_CMD_NAND=y
|
||||
# CONFIG_CMD_PINMUX is not set
|
||||
CONFIG_CMD_SF=y
|
||||
CONFIG_CMD_SPI=y
|
||||
CONFIG_CMD_USB=y
|
||||
|
|
@ -41,19 +53,30 @@ CONFIG_CMD_PING=y
|
|||
CONFIG_CMD_MTDPARTS=y
|
||||
# CONFIG_DOS_PARTITION is not set
|
||||
CONFIG_OF_CONTROL=y
|
||||
CONFIG_OF_EMBED=y
|
||||
CONFIG_SPL_OF_CONTROL=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20-taurus"
|
||||
CONFIG_SPL_OF_PLATDATA=y
|
||||
CONFIG_ENV_IS_IN_NAND=y
|
||||
CONFIG_SPL_DM=y
|
||||
CONFIG_BLK=y
|
||||
CONFIG_CLK=y
|
||||
CONFIG_CLK_AT91=y
|
||||
CONFIG_DFU_NAND=y
|
||||
# CONFIG_MMC is not set
|
||||
CONFIG_NAND=y
|
||||
CONFIG_NAND_ATMEL=y
|
||||
CONFIG_DM_SPI_FLASH=y
|
||||
CONFIG_SPI_FLASH=y
|
||||
CONFIG_SPI_FLASH_STMICRO=y
|
||||
CONFIG_PHYLIB=y
|
||||
CONFIG_PINCTRL=y
|
||||
CONFIG_PINCTRL_AT91=y
|
||||
CONFIG_SPECIFY_CONSOLE_INDEX=y
|
||||
CONFIG_DEBUG_UART_ATMEL=y
|
||||
CONFIG_ATMEL_USART=y
|
||||
CONFIG_USB=y
|
||||
CONFIG_DM_USB=y
|
||||
# CONFIG_SPL_DM_USB is not set
|
||||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_USB_GADGET=y
|
||||
CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
|
||||
|
|
@ -63,3 +86,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
|
|||
CONFIG_WDT=y
|
||||
CONFIG_WDT_AT91=y
|
||||
CONFIG_USE_TINY_PRINTF=y
|
||||
CONFIG_HEXDUMP=y
|
||||
# CONFIG_EFI_LOADER is not set
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@
|
|||
#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
|
||||
#define CONFIG_SETUP_MEMORY_TAGS
|
||||
#define CONFIG_INITRD_TAG
|
||||
|
||||
#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
|
||||
|
||||
/* general purpose I/O */
|
||||
|
|
@ -48,12 +49,9 @@
|
|||
#define CONFIG_AT91_GPIO
|
||||
#define CONFIG_AT91_GPIO_PULLUP 1 /* keep pullups on peripheral pins */
|
||||
|
||||
/* serial console */
|
||||
#define CONFIG_ATMEL_USART
|
||||
#define CONFIG_USART_BASE ATMEL_BASE_DBGU
|
||||
#define CONFIG_USART_ID ATMEL_ID_SYS
|
||||
|
||||
|
||||
/*
|
||||
* SDRAM: 1 bank, min 32, max 128 MB
|
||||
* Initialized before u-boot gets started.
|
||||
|
|
@ -106,7 +104,6 @@
|
|||
|
||||
/* SPI EEPROM */
|
||||
#define TAURUS_SPI_MASK (1 << 4)
|
||||
#define TAURUS_SPI_CS_PIN AT91_PIN_PA3
|
||||
|
||||
#if defined(CONFIG_SPL_BUILD)
|
||||
/* SPL related */
|
||||
|
|
@ -120,8 +117,57 @@
|
|||
#define CONFIG_ENV_OFFSET 0x100000
|
||||
#define CONFIG_ENV_OFFSET_REDUND 0x180000
|
||||
#define CONFIG_ENV_SIZE (SZ_128K) /* 1 sector = 128 kB */
|
||||
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm"
|
||||
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#if defined(CONFIG_BOARD_AXM)
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \
|
||||
"${gatewayip}:${netmask}:${hostname}:${netdev}::off\0" \
|
||||
"addtest=setenv bootargs ${bootargs} loglevel=4 test\0" \
|
||||
"boot_file=setenv bootfile /${project_dir}/kernel/uImage\0" \
|
||||
"boot_retries=0\0" \
|
||||
"ethact=macb0\0" \
|
||||
"flash_nfs=run nand_kernel;run nfsargs;run addip;" \
|
||||
"upgrade_available;bootm ${kernel_ram};reset\0" \
|
||||
"flash_self=run nand_kernel;run setbootargs;upgrade_available;" \
|
||||
"bootm ${kernel_ram};reset\0" \
|
||||
"flash_self_test=run nand_kernel;run setbootargs addtest;" \
|
||||
"upgrade_available;bootm ${kernel_ram};reset\0" \
|
||||
"hostname=systemone\0" \
|
||||
"kernel_Off=0x00200000\0" \
|
||||
"kernel_Off_fallback=0x03800000\0" \
|
||||
"kernel_ram=0x21500000\0" \
|
||||
"kernel_size=0x00400000\0" \
|
||||
"kernel_size_fallback=0x00400000\0" \
|
||||
"loads_echo=1\0" \
|
||||
"nand_kernel=nand read.e ${kernel_ram} ${kernel_Off} " \
|
||||
"${kernel_size}\0" \
|
||||
"net_nfs=run boot_file;tftp ${kernel_ram} ${bootfile};" \
|
||||
"run nfsargs;run addip;upgrade_available;" \
|
||||
"bootm ${kernel_ram};reset\0" \
|
||||
"netdev=eth0\0" \
|
||||
"nfsargs=run root_path;setenv bootargs ${bootargs} root=/dev/nfs " \
|
||||
"rw nfsroot=${serverip}:${rootpath} " \
|
||||
"at91sam9_wdt.wdt_timeout=16\0" \
|
||||
"partitionset_active=A\0" \
|
||||
"preboot=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\0" \
|
||||
"project_dir=systemone\0" \
|
||||
"root_path=setenv rootpath /home/projects/${project_dir}/rootfs\0" \
|
||||
"rootfs=/dev/mtdblock5\0" \
|
||||
"rootfs_fallback=/dev/mtdblock7\0" \
|
||||
"setbootargs=setenv bootargs ${bootargs} console=ttyMTD,mtdoops " \
|
||||
"root=${rootfs} rootfstype=jffs2 panic=7 " \
|
||||
"at91sam9_wdt.wdt_timeout=16\0" \
|
||||
"stderr=serial\0" \
|
||||
"stdin=serial\0" \
|
||||
"stdout=serial\0" \
|
||||
"upgrade_available=0\0"
|
||||
#endif
|
||||
#endif /* #ifndef CONFIG_SPL_BUILD */
|
||||
/*
|
||||
* Size of malloc() pool
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -118,7 +118,6 @@ CONFIG_BMP_32BPP
|
|||
CONFIG_BOARDDIR
|
||||
CONFIG_BOARDNAME
|
||||
CONFIG_BOARDNAME_LOCAL
|
||||
CONFIG_BOARD_AXM
|
||||
CONFIG_BOARD_COMMON
|
||||
CONFIG_BOARD_ECC_SUPPORT
|
||||
CONFIG_BOARD_IS_OPENRD_BASE
|
||||
|
|
@ -128,7 +127,6 @@ CONFIG_BOARD_NAME
|
|||
CONFIG_BOARD_POSTCLK_INIT
|
||||
CONFIG_BOARD_REVISION_TAG
|
||||
CONFIG_BOARD_SIZE_LIMIT
|
||||
CONFIG_BOARD_TAURUS
|
||||
CONFIG_BOOGER
|
||||
CONFIG_BOOTBLOCK
|
||||
CONFIG_BOOTFILE
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user