arm nomadik: rename board and cleanup config
PATCH 1/1 arm nomadik: rename board and cleanup config
From: Alessandro Rubini <[email protected]>
This patch cleans up some glitches in the initial submission:
- nobody calls it "nmdk8815": the board is "nhk8815", so rename
- nand and onenand can coexist, so fix config file accordingly
- configure the chip select for OneNand, so it works properly
- removed a pair of unused defines and reordered the jffs defs
- add some comments and an explanation of the two configs
---
If needed I can split this, but I think it's trivial enough. Over this I'll send a few additions in the next days.
Makefile | 10 ++--
board/st/{nmdk8815 => nhk8815}/Makefile | 2 +-
board/st/{nmdk8815 => nhk8815}/config.mk | 0
.../st/{nmdk8815/nmdk8815.c => nhk8815/nhk8815.c} | 4 ++
board/st/{nmdk8815 => nhk8815}/platform.S | 0
cpu/arm926ejs/nomadik/reset.S | 12 +----
doc/{README.nmdk8815 => README.nhk8815} | 9 +++
include/configs/{nmdk8815.h => nhk8815.h} | 57 ++++++++++++--------
8 files changed, 55 insertions(+), 39 deletions(-)
rename board/st/{nmdk8815 => nhk8815}/Makefile (98%)
rename board/st/{nmdk8815 => nhk8815}/config.mk (100%)
rename board/st/{nmdk8815/nmdk8815.c => nhk8815/nhk8815.c} (91%)
rename board/st/{nmdk8815 => nhk8815}/platform.S (100%)
rename doc/{README.nmdk8815 => README.nhk8815} (75%)
rename include/configs/{nmdk8815.h => nhk8815.h} (77%)Makefile +5 -5
@@ -2841,17 +2841,17 @@ mx1fs2_config : unconfig netstar_config: unconfig @$(MKCONFIG) $(@:_config=) arm arm925t netstar -nmdk8815_config \ -nmdk8815_onenand_config: unconfig +nhk8815_config \ +nhk8815_onenand_config: unconfig @mkdir -p $(obj)include @ > $(obj)include/config.h @if [ "$(findstring _onenand, $@)" ] ; then \ echo "#define CONFIG_BOOT_ONENAND" >> $(obj)include/config.h; \ - $(XECHO) "... configured for OneNand Flash"; \ + $(XECHO) "... configured to boot from OneNand Flash"; \ else \ - $(XECHO) "... configured for Nand Flash"; \ + $(XECHO) "... configured to boot from Nand Flash"; \ fi - @$(MKCONFIG) -a nmdk8815 arm arm926ejs nmdk8815 st nomadik + @$(MKCONFIG) -a nhk8815 arm arm926ejs nhk8815 st nomadik omap1510inn_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm925t omap1510inn
board/st/nhk8815/Makefile renamed from board/st/nmdk8815/Makefile +1 -1
@@ -29,7 +29,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS := nmdk8815.o +COBJS := nhk8815.o SOBJS := platform.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
board/st/nhk8815/config.mk renamed from board/st/nmdk8815/config.mk +0 -0
board/st/nhk8815/nhk8815.c renamed from board/st/nmdk8815/nmdk8815.c +4 -0
@@ -53,6 +53,10 @@ int board_init(void)writel (0x0000305b ,REG_FSMC_BCR1 );writel (0x00033f33 ,REG_FSMC_BTR1 ); +/* Set up SMCS0 for OneNand: sram-like once again */ +writel (0x000030db ,NOMADIK_FSMC_BASE +0x00 );/* FSMC_BCR0 */ +writel (0x02100551 ,NOMADIK_FSMC_BASE +0x04 );/* FSMC_BTR0 */ +icache_enable ();return 0 ; }
board/st/nhk8815/platform.S renamed from board/st/nmdk8815/platform.S +0 -0
cpu/arm926ejs/nomadik/reset.S +1 -11
@@ -6,20 +6,10 @@ .align 5 .globl reset_cpu reset_cpu: -#if defined CONFIG_NOMADIK_8815 - ldr r0, =NOMADIK_SRC_BASE + ldr r0, =NOMADIK_SRC_BASE /* System and Reset Controller */ ldr r1, =0x1 str r1, [r0, #0x18] -#else - ldr r1, rstctl1 /* get clkm1 reset ctl */ - mov r3, #0x0 - strh r3, [r1] /* clear it */ - mov r3, #0x8 - strh r3, [r1] /* force dsp+arm reset */ -#endif _loop_forever: b _loop_forever -rstctl1: - .word 0xfffece10
doc/README.nhk8815 renamed from doc/README.nmdk8815 +9 -0
@@ -15,6 +15,15 @@ SDRAM configuration, PLL setup and initial loading from NAND is implemented in the X-Loader, so U-Boot is already running in SDRAM when control is handed over to it. +The Makefile offers two different configurations to be used if you +boot from Nand or OneNand. + + make nhk8815_config + make nhk8815_onenand_config + +Both support OneNand and Nand. Since U-Boot, running in RAM, can't know +where it was loaded from, the configurations differ in where the filesystem +is looked for by default. On www.st.com/nomadik and on www.stnwireless.com there are documents, summary data and white papers on Nomadik. The full datasheet for
include/configs/nhk8815.h renamed from include/configs/nmdk8815.h +35 -22
106 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 1/1 arm nomadik: rename board and cleanup config
Quoted 9 lines · Alessandro Rubini
From: Alessandro Rubini <[email protected]>
This patch cleans up some glitches in the initial submission:
- nobody calls it "nmdk8815": the board is "nhk8815", so rename
- nand and onenand can coexist, so fix config file accordingly
- configure the chip select for OneNand, so it works properly
- removed a pair of unused defines and reordered the jffs defs
- add some comments and an explanation of the two configs
Quoted 6 lines
Signed-off-by Alessandro Rubini <[email protected]>Acked-by Andrea Gallo <[email protected]>---
If needed I can split this, but I think it's trivial enough. Over this I'll send a few additions in the next days.
yes please split it as this
PATCH 1 the rename
patch 2 the board cleanup
patch 3 reset cleanup
patch 4 the nand , onenand
or something similar please we need to be able to bisect each change otherwise fine
Best Regards,
J.