V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master'

This commit is contained in:
Albert ARIBAUD 2014-10-07 12:11:32 +02:00
parent 6dd0e7c00b 45e60c25b5
commit 1454ba8e56
2 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/configs/lsxl.h
View File

@ -8,6 +8,8 @@
#ifndef _CONFIG_LSXL_H #ifndef _CONFIG_LSXL_H
#define _CONFIG_LSXL_H #define _CONFIG_LSXL_H
#define CONFIG_SYS_GENERIC_BOARD
/* /*
* Version number information * Version number information
*/ */
@ -157,7 +159,7 @@
"standard_env=setenv ipaddr; setenv netmask; setenv serverip; " \ "standard_env=setenv ipaddr; setenv netmask; setenv serverip; " \
"setenv ncip; setenv gatewayip; setenv ethact; " \ "setenv ncip; setenv gatewayip; setenv ethact; " \
"setenv bootfile; setenv dnsip; " \ "setenv bootfile; setenv dnsip; " \
"setenv bootsource hdd; run ser\0" \ "setenv bootsource legacy; run ser\0" \
"restore_env=run standard_env; saveenv; reset\0" \ "restore_env=run standard_env; saveenv; reset\0" \
"ser=setenv stdin serial; setenv stdout serial; " \ "ser=setenv stdin serial; setenv stdout serial; " \
"setenv stderr serial\0" \ "setenv stderr serial\0" \

46
include/configs/sheevaplug.h
View File

@ -1,5 +1,6 @@
/* /*
* (C) Copyright 2009 * (C) Copyright 2009-2014
* Gerald Kerma <dreagle@doukki.net>
* Marvell Semiconductor <www.marvell.com> * Marvell Semiconductor <www.marvell.com>
* Written-by: Prafulla Wadaskar <prafulla@marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
* *
@ -22,13 +23,27 @@
#define CONFIG_MACH_SHEEVAPLUG /* Machine type */ #define CONFIG_MACH_SHEEVAPLUG /* Machine type */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
/*
* Compression configuration
*/
#define CONFIG_BZIP2
#define CONFIG_LZMA
#define CONFIG_LZO
/*
* Miscellaneous configurable options
*/
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
/* /*
* Commands configuration * Commands configuration
*/ */
#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
#include <config_cmd_default.h> #include <config_cmd_default.h>
#define CONFIG_CMD_BOOTZ
#define CONFIG_CMD_DHCP #define CONFIG_CMD_DHCP
#define CONFIG_CMD_ENV #define CONFIG_CMD_ENV
#define CONFIG_CMD_IDE
#define CONFIG_CMD_MII #define CONFIG_CMD_MII
#define CONFIG_CMD_MMC #define CONFIG_CMD_MMC
#define CONFIG_CMD_NAND #define CONFIG_CMD_NAND
@ -54,8 +69,8 @@
* it has to be rounded to sector size * it has to be rounded to sector size
*/ */
#define CONFIG_ENV_SIZE 0x20000 /* 128k */ #define CONFIG_ENV_SIZE 0x20000 /* 128k */
#define CONFIG_ENV_ADDR 0x60000 #define CONFIG_ENV_ADDR 0x80000
#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */ #define CONFIG_ENV_OFFSET 0x80000 /* env starts here */
/* /*
* Default environment variables * Default environment variables
@ -64,8 +79,10 @@
"setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \ "setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \
"${x_bootcmd_usb}; bootm 0x6400000;" "${x_bootcmd_usb}; bootm 0x6400000;"
#define CONFIG_MTDPARTS "orion_nand:512k(uboot)," \ #define CONFIG_MTDPARTS \
"3m@1m(kernel),1m@4m(psm),13m@5m(rootfs) rw\0" "mtdparts=orion_nand:512K(uboot)," \
"512K(env),1M(script),6M(kernel)," \
"12M(ramdisk),4M(spare),-(rootfs)"
#define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \ #define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \
"=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \ "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \
@ -73,6 +90,11 @@
"x_bootcmd_usb=usb start\0" \ "x_bootcmd_usb=usb start\0" \
"x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0" "x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"
#define MTDIDS_DEFAULT "nand0=orion_nand"
#define MTDPARTS_DEFAULT \
"mtdparts="CONFIG_MTDPARTS
/* /*
* Ethernet Driver configuration * Ethernet Driver configuration
*/ */
@ -91,10 +113,24 @@
#define CONFIG_SYS_MMC_BASE KW_SDIO_BASE #define CONFIG_SYS_MMC_BASE KW_SDIO_BASE
#endif /* CONFIG_CMD_MMC */ #endif /* CONFIG_CMD_MMC */
/*
* SATA driver configuration
*/
#ifdef CONFIG_CMD_IDE
#define __io
#define CONFIG_IDE_PREINIT
#define CONFIG_DOS_PARTITION
#define CONFIG_MVSATA_IDE_USE_PORT0
#define CONFIG_MVSATA_IDE_USE_PORT1
#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET
#define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET
#endif /* CONFIG_CMD_IDE */
/* /*
* File system * File system
*/ */
#define CONFIG_CMD_EXT2 #define CONFIG_CMD_EXT2
#define CONFIG_CMD_EXT4
#define CONFIG_CMD_FAT #define CONFIG_CMD_FAT
#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_JFFS2
#define CONFIG_CMD_UBI #define CONFIG_CMD_UBI