mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
Merge branch 'master' of git://git.denx.de/u-boot-at91
This commit is contained in:
Wolfgang Denk
commit
13d36ec849
8 changed files with 154 additions and 20 deletions
54
Makefile
54
Makefile
|
|
@ -2592,17 +2592,63 @@ afeb9260_config: unconfig
|
|||
at91cap9adk_config : unconfig
|
||||
@$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91
|
||||
|
||||
at91sam9260ek_nandflash_config \
|
||||
at91sam9260ek_dataflash_cs0_config \
|
||||
at91sam9260ek_dataflash_cs1_config \
|
||||
at91sam9260ek_config : unconfig
|
||||
@$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9260ek atmel at91
|
||||
@if [ "$(findstring _nandflash,$@)" ] ; then \
|
||||
echo "#define CONFIG_SYS_USE_NANDFLASH 1" >>$(obj)include/config.h ; \
|
||||
$(XECHO) "... with environment variable in NAND FLASH" ; \
|
||||
elif [ "$(findstring dataflash_cs0,$@)" ] ; then \
|
||||
echo "#define CONFIG_SYS_USE_DATAFLASH_CS0 1" >>$(obj)include/config.h ; \
|
||||
$(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \
|
||||
else \
|
||||
echo "#define CONFIG_SYS_USE_DATAFLASH_CS1 1" >>$(obj)include/config.h ; \
|
||||
$(XECHO) "... with environment variable in SPI DATAFLASH CS1" ; \
|
||||
fi;
|
||||
@$(MKCONFIG) -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91
|
||||
|
||||
at91sam9261ek_nandflash_config \
|
||||
at91sam9261ek_dataflash_cs0_config \
|
||||
at91sam9261ek_dataflash_cs3_config \
|
||||
at91sam9261ek_config : unconfig
|
||||
@$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9261ek atmel at91
|
||||
@if [ "$(findstring _nandflash,$@)" ] ; then \
|
||||
echo "#define CONFIG_SYS_USE_NANDFLASH 1" >>$(obj)include/config.h ; \
|
||||
$(XECHO) "... with environment variable in NAND FLASH" ; \
|
||||
elif [ "$(findstring dataflash_cs3,$@)" ] ; then \
|
||||
echo "#define CONFIG_SYS_USE_DATAFLASH_CS3 1" >>$(obj)include/config.h ; \
|
||||
$(XECHO) "... with environment variable in SPI DATAFLASH CS3" ; \
|
||||
else \
|
||||
echo "#define CONFIG_SYS_USE_DATAFLASH_CS0 1" >>$(obj)include/config.h ; \
|
||||
$(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \
|
||||
fi;
|
||||
@$(MKCONFIG) -a at91sam9261ek arm arm926ejs at91sam9261ek atmel at91
|
||||
|
||||
at91sam9263ek_nandflash_config \
|
||||
at91sam9263ek_dataflash_config \
|
||||
at91sam9263ek_dataflash_cs0_config \
|
||||
at91sam9263ek_config : unconfig
|
||||
@$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9263ek atmel at91
|
||||
@if [ "$(findstring _nandflash,$@)" ] ; then \
|
||||
echo "#define CONFIG_SYS_USE_NANDFLASH 1" >>$(obj)include/config.h ; \
|
||||
$(XECHO) "... with environment variable in NAND FLASH" ; \
|
||||
else \
|
||||
echo "#define CONFIG_SYS_USE_DATAFLASH 1" >>$(obj)include/config.h ; \
|
||||
$(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \
|
||||
fi;
|
||||
@$(MKCONFIG) -a at91sam9263ek arm arm926ejs at91sam9263ek atmel at91
|
||||
|
||||
at91sam9rlek_nandflash_config \
|
||||
at91sam9rlek_dataflash_config \
|
||||
at91sam9rlek_dataflash_cs0_config \
|
||||
at91sam9rlek_config : unconfig
|
||||
@$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9rlek atmel at91
|
||||
@if [ "$(findstring _nandflash,$@)" ] ; then \
|
||||
echo "#define CONFIG_SYS_USE_NANDFLASH 1" >>$(obj)include/config.h ; \
|
||||
$(XECHO) "... with environment variable in NAND FLASH" ; \
|
||||
else \
|
||||
echo "#define CONFIG_SYS_USE_DATAFLASH 1" >>$(obj)include/config.h ; \
|
||||
$(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \
|
||||
fi;
|
||||
@$(MKCONFIG) -a at91sam9rlek arm arm926ejs at91sam9rlek atmel at91
|
||||
|
||||
########################################################################
|
||||
## ARM Integrator boards - see doc/README-integrator for more info.
|
||||
|
|
|
|||
|
|
@ -1,3 +1,2 @@
|
|||
PLATFORM_CPPFLAGS += -march=armv5te
|
||||
PLATFORM_CPPFLAGS += $(call cc-option,-mtune=arm926ejs,)
|
||||
LDSCRIPT := $(SRCTREE)/cpu/arm926ejs/at91/u-boot.lds
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \
|
||||
-msoft-float
|
||||
|
||||
PLATFORM_CPPFLAGS += -march=armv4
|
||||
PLATFORM_CPPFLAGS += -march=armv5te
|
||||
# =========================================================================
|
||||
#
|
||||
# Supply options according to compiler version
|
||||
|
|
|
|||
88
doc/README.at91
Normal file
88
doc/README.at91
Normal file
|
|
@ -0,0 +1,88 @@
|
|||
Atmel AT91 Evaluation kits
|
||||
|
||||
http://atmel.com/dyn/products/tools.asp?family_id=605#1443
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
AT91SAM9260EK
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
Memory map
|
||||
0x20000000 - 23FFFFFF SDRAM (64 MB)
|
||||
0xC0000000 - Cxxxxxxx Atmel Dataflash card (J13)
|
||||
0xD0000000 - Dxxxxxxx Soldered Atmel Dataflash
|
||||
|
||||
Environment variables
|
||||
|
||||
U-Boot environment variables can be stored at different places:
|
||||
- Dataflash on SPI chip select 1 (default)
|
||||
- Dataflash on SPI chip select 0 (dataflash card)
|
||||
- Nand flash.
|
||||
|
||||
You can choose your storage location at config step (here for at91sam9260ek) :
|
||||
make at91sam9260ek_config - use data flash (spi cs1) (default)
|
||||
make at91sam9260ek_nandflash_config - use nand flash
|
||||
make at91sam9260ek_dataflash_cs0_config - use data flash (spi cs0)
|
||||
make at91sam9260ek_dataflash_cs1_config - use data flash (spi cs1)
|
||||
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
AT91SAM9261EK
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
Memory map
|
||||
0x20000000 - 23FFFFFF SDRAM (64 MB)
|
||||
0xC0000000 - Cxxxxxxx Soldered Atmel Dataflash
|
||||
0xD0000000 - Dxxxxxxx Atmel Dataflash card (J22)
|
||||
|
||||
Environment variables
|
||||
|
||||
U-Boot environment variables can be stored at different places:
|
||||
- Dataflash on SPI chip select 0 (default)
|
||||
- Dataflash on SPI chip select 3 (dataflash card)
|
||||
- Nand flash.
|
||||
|
||||
You can choose your storage location at config step (here for at91sam9260ek) :
|
||||
make at91sam9261ek_config - use data flash (spi cs0) (default)
|
||||
make at91sam9261ek_nandflash_config - use nand flash
|
||||
make at91sam9261ek_dataflash_cs0_config - use data flash (spi cs0)
|
||||
make at91sam9261ek_dataflash_cs3_config - use data flash (spi cs3)
|
||||
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
AT91SAM9263EK
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
Memory map
|
||||
0x20000000 - 23FFFFFF SDRAM (64 MB)
|
||||
0xC0000000 - Cxxxxxxx Atmel Dataflash card (J9)
|
||||
|
||||
Environment variables
|
||||
|
||||
U-Boot environment variables can be stored at different places:
|
||||
- Dataflash on SPI chip select 0 (dataflash card)
|
||||
- Nand flash.
|
||||
|
||||
You can choose your storage location at config step (here for at91sam9260ek) :
|
||||
make at91sam9263ek_config - use data flash (spi cs0) (default)
|
||||
make at91sam9263ek_nandflash_config - use nand flash
|
||||
make at91sam9263ek_dataflash_cs0_config - use data flash (spi cs0)
|
||||
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
AT91SAM9RLEK
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
Memory map
|
||||
0x20000000 - 23FFFFFF SDRAM (64 MB)
|
||||
0xC0000000 - Cxxxxxxx Soldered Atmel Dataflash
|
||||
|
||||
Environment variables
|
||||
|
||||
U-Boot environment variables can be stored at different places:
|
||||
- Dataflash on SPI chip select 0
|
||||
- Nand flash.
|
||||
|
||||
You can choose your storage location at config step (here for at91sam9260ek) :
|
||||
make at91sam9263ek_config - use data flash (spi cs0) (default)
|
||||
make at91sam9263ek_nandflash_config - use nand flash
|
||||
make at91sam9263ek_dataflash_cs0_config - use data flash (spi cs0)
|
||||
|
|
@ -131,10 +131,6 @@
|
|||
#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM
|
||||
#define CONFIG_SYS_MEMTEST_END 0x23e00000
|
||||
|
||||
#undef CONFIG_SYS_USE_DATAFLASH_CS0
|
||||
#define CONFIG_SYS_USE_DATAFLASH_CS1 1
|
||||
#undef CONFIG_SYS_USE_NANDFLASH
|
||||
|
||||
#ifdef CONFIG_SYS_USE_DATAFLASH_CS0
|
||||
|
||||
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
|
||||
|
|
|
|||
|
|
@ -144,15 +144,12 @@
|
|||
#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM
|
||||
#define CONFIG_SYS_MEMTEST_END 0x23e00000
|
||||
|
||||
#define CONFIG_SYS_USE_DATAFLASH_CS0 1
|
||||
#undef CONFIG_SYS_USE_NANDFLASH
|
||||
|
||||
#ifdef CONFIG_SYS_USE_DATAFLASH_CS0
|
||||
|
||||
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
|
||||
#define CONFIG_ENV_IS_IN_DATAFLASH 1
|
||||
#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
|
||||
#define CONFIG_ENV_OFFSET 0x4200
|
||||
#define CONFIG_ENV_OFFSET 0x4200
|
||||
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
|
||||
#define CONFIG_ENV_SIZE 0x4200
|
||||
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
|
||||
|
|
@ -161,6 +158,20 @@
|
|||
"mtdparts=at91_nand:-(root) " \
|
||||
"rw rootfstype=jffs2"
|
||||
|
||||
#elif CONFIG_SYS_USE_DATAFLASH_CS3
|
||||
|
||||
/* bootstrap + u-boot + env + linux in dataflash on CS3 */
|
||||
#define CONFIG_ENV_IS_IN_DATAFLASH 1
|
||||
#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + 0x8400)
|
||||
#define CONFIG_ENV_OFFSET 0x4200
|
||||
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + CONFIG_ENV_OFFSET)
|
||||
#define CONFIG_ENV_SIZE 0x4200
|
||||
#define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm"
|
||||
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
|
||||
"root=/dev/mtdblock0 " \
|
||||
"mtdparts=at91_nand:-(root) " \
|
||||
"rw rootfstype=jffs2"
|
||||
|
||||
#else /* CONFIG_SYS_USE_NANDFLASH */
|
||||
|
||||
/* bootstrap + u-boot + env + linux in nandflash */
|
||||
|
|
|
|||
|
|
@ -151,9 +151,6 @@
|
|||
#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM
|
||||
#define CONFIG_SYS_MEMTEST_END 0x23e00000
|
||||
|
||||
#define CONFIG_SYS_USE_DATAFLASH 1
|
||||
#undef CONFIG_SYS_USE_NANDFLASH
|
||||
|
||||
#ifdef CONFIG_SYS_USE_DATAFLASH
|
||||
|
||||
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
|
||||
|
|
|
|||
|
|
@ -118,9 +118,6 @@
|
|||
#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM
|
||||
#define CONFIG_SYS_MEMTEST_END 0x23e00000
|
||||
|
||||
#define CONFIG_SYS_USE_DATAFLASH 1
|
||||
#undef CONFIG_SYS_USE_NANDFLASH
|
||||
|
||||
#ifdef CONFIG_SYS_USE_DATAFLASH
|
||||
|
||||
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue