Update board NetStar
PATCH 1/1 Update board NetStar
Hi,
following patch brings board NetStar back into shape.
CHANGELOG
* Make NAND work again (broken after new NAND code merge)
* Move conditional compilation to Makefile
* Enable I2C driver and RTC clock
board/netstar/Makefile +8 -6
@@ -26,15 +26,17 @@ include $(TOPDIR)/config.mk -LIB = $(obj)lib$(BOARD).a +LIB := $(obj)lib$(BOARD).a -COBJS := netstar.o flash.o nand.o -SOBJS := setup.o crcek.o +SOBJS-y := setup.o crcek.o +COBJS-y := netstar.o +COBJS-$(CONFIG_CMD_FLASH) += flash.o +COBJS-$(CONFIG_CMD_NAND) += nand.o -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) eeprom.c \ +SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) eeprom.c \ eeprom_start.S -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS-y)) gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`)
board/netstar/crcit.c +7 -7
@@ -31,11 +31,11 @@#include <sys/stat.h> #include "crcek.h" -extern unsigned long crc32 (unsigned long ,const unsigned char *,unsigned int ); +extern uint32_t crc32 (uint32_t ,const unsigned char *,uint ); -uint32_t data[LOADER_SIZE /4 +3 ]; +static uint32_t data[LOADER_SIZE /4 +3 ]; -int doit (char *path,unsigned version) +static int do_crc (char *path,unsigned version) {uint32_t *p;ssize_t size;
@@ -56,10 +56,10 @@ int doit(char *path, unsigned version)fprintf (stderr,"File too large\n" );return EXIT_FAILURE ; } - size = (((size -1 ) >>2 ) +1 ) <<2 ; + size = (size +3 ) & ~3 ;/* round up to 4 bytes */ data[0 ] = size +4 ;/* add size of version field */ data[1 ] = version; - data[(size >>2 ) +2 ] =crc32 (0 , (unsigned char *)(data +1 ), data[0 ]); + data[2 + (size >>2 )] =crc32 (0 , (unsigned char *)(data +1 ), data[0 ]);close (fd);if (write (STDOUT_FILENO , data, size +3 *4 ) ==-1 ) {
@@ -73,12 +73,12 @@ int doit(char *path, unsigned version)int main (int argc,char **argv) {if (argc ==2 ) { -return doit (argv[1 ],0 ); +return do_crc (argv[1 ],0 ); }else if ((argc ==4 ) && (strcmp (argv[1 ],"-v" ) ==0 )) {char *endptr, *nptr = argv[2 ];unsigned ver =strtoul (nptr, &endptr,0 );if (*nptr !='\0' && *endptr =='\0' ) -return doit (argv[3 ], ver); +return do_crc (argv[3 ], ver); }fprintf (stderr,"Usage: crcit [-v version] <image>\n" );
board/netstar/flash.c +0 -6
@@ -27,10 +27,6 @@*/ #include <common.h> - -/*#if 0 */ -#if (PHYS_SDRAM_1_SIZE !=SZ_32M ) -#include "crcek.h" #if (CONFIG_SYS_MAX_FLASH_BANKS >1 )
@@ -339,5 +335,3 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)return write_hword (info, wp, data); } - -#endif
board/netstar/nand.c +12 -19
@@ -22,33 +22,27 @@#include <common.h> #include <asm/io.h> - -#if defined(CONFIG_CMD_NAND ) -#include <nand.h> /* * hardware specific access to control-lines +* +* NAND_NCE: bit 0 - don't care +* NAND_CLE: bit 1 -> bit 1 (0x0002) +* NAND_ALE: bit 2 -> bit 2 (0x0004) */ -#define MASK_CLE 0x02 -#define MASK_ALE 0x04 -static void netstar_nand_hwcontrol (struct mtd_info *mtd,int cmd,unsigned int ctrl) { -struct nand_chip *this = mtd->priv; -ulong IO_ADDR_W = (ulong ) this->IO_ADDR_W; +struct nand_chip *chip = mtd->priv; +unsigned long mask; -IO_ADDR_W &= ~(MASK_ALE |MASK_CLE ); -if (ctrl &NAND_CTRL_CHANGE ) { -if ( ctrl &NAND_CLE ) -IO_ADDR_W |=MASK_CLE ; -if ( ctrl &NAND_ALE ) -IO_ADDR_W |=MASK_ALE ; - } - this->IO_ADDR_W = (void __iomem *)IO_ADDR_W ; +if (cmd ==NAND_CMD_NONE ) +return ; -if (cmd !=NAND_CMD_NONE ) -writeb (cmd, this->IO_ADDR_W); + mask = (ctrl &NAND_CLE ) ?0x02 :0 ; +if (ctrl &NAND_ALE ) + mask |=0x04 ; +writeb (cmd, (unsigned long )chip->IO_ADDR_W | mask); }int board_nand_init (struct nand_chip *nand)
@@ -59,4 +53,3 @@ int board_nand_init(struct nand_chip *nand) nand->chip_delay =400 ;return 0 ; } -#endif
board/netstar/netstar.c +4 -0
@@ -21,6 +21,7 @@*/ #include <common.h> +#include <i2c.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -52,6 +53,9 @@ int dram_init(void)int misc_init_r (void ) { +/* enable trickle charge */ +i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR ,0x10 ,0xaa ); +return 0 ; }
include/configs/netstar.h +16 -15
@@ -64,12 +64,11 @@*/ #define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1#define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define PHYS_FLASH_1_SIZE (1 * 1024 * 1024) +#define PHYS_FLASH_1_SIZE (1 * 1024 * 1024)#define CONFIG_SYS_MAX_FLASH_SECT 19#define CONFIG_SYS_FLASH_ERASE_TOUT (5*CONFIG_SYS_HZ)/* in ticks */ #define CONFIG_SYS_FLASH_WRITE_TOUT (5*CONFIG_SYS_HZ) - -#define CONFIG_SYS_MONITOR_BASE PHYS_FLASH_1 +#define CONFIG_SYS_MONITOR_BASE PHYS_FLASH_1#define CONFIG_SYS_MONITOR_LEN (256 * 1024)/*
@@ -100,28 +99,30 @@#define CONFIG_DRIVER_SMC91111 #define CONFIG_SMC91111_BASE 0x04000300 -/* -* NS16550 Configuration -*/ +#define CONFIG_HARD_I2C +#define CONFIG_SYS_I2C_SPEED 100000 +#define CONFIG_SYS_I2C_SLAVE 1 +#define CONFIG_DRIVER_OMAP1510_I2C + +#define CONFIG_RTC_DS1307 +#define CONFIG_SYS_I2C_RTC_ADDR 0x68 +#define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4)#define CONFIG_SYS_NS16550_CLK (CONFIG_XTAL_FREQ)/* can be 12M/32Khz or 48Mhz */ -#define CONFIG_SYS_NS16550_COM1 OMAP1510_UART1_BASE/* uart1 */ +#define CONFIG_SYS_NS16550_COM1 OMAP1510_UART1_BASE/* uart1 */ -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 +#define CONFIG_CONS_INDEX 1 +#define CONFIG_BAUDRATE 115200#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }/*#define CONFIG_SKIP_RELOCATE_UBOOT*/ /*#define CONFIG_SKIP_LOWLEVEL_INIT */ -/* -* NAND flash -*/ #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE 0x04000000 + (2 << 23) -#define NAND_ALLOW_ERASE_ALL 1 +#define CONFIG_SYS_NAND_BASE 0x04000000 + (2 << 23) +#define NAND_ALLOW_ERASE_ALL 1/* * partitions (mtdparts command line support)
@@ -136,9 +137,9 @@/* * Command line configuration. */ -#define CONFIG_CMD_BDI #define CONFIG_CMD_BOOTD +#define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_SAVEENV #define CONFIG_CMD_FLASH
PATCH 1/1 Update board NetStar
Quoted 1 line · Ladislav Michl
following patch brings board NetStar back into shape.
After some private conversation with Jean-Christophe this patch splits into following serie. Many thanks to Jean-Christophe for suggestions.
PATCH 1/5 NetStar: config reindentation
Fix indentation broken by symbol renames. "Sort" driver related definitons.
include/configs/netstar.h +13 -19
@@ -64,12 +64,12 @@*/ #define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1#define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define PHYS_FLASH_1_SIZE (1 * 1024 * 1024) +#define PHYS_FLASH_1_SIZE (1 * 1024 * 1024)#define CONFIG_SYS_MAX_FLASH_SECT 19#define CONFIG_SYS_FLASH_ERASE_TOUT (5*CONFIG_SYS_HZ)/* in ticks */ #define CONFIG_SYS_FLASH_WRITE_TOUT (5*CONFIG_SYS_HZ) -#define CONFIG_SYS_MONITOR_BASE PHYS_FLASH_1 +#define CONFIG_SYS_MONITOR_BASE PHYS_FLASH_1#define CONFIG_SYS_MONITOR_LEN (256 * 1024)/*
@@ -97,33 +97,28 @@/* * Hardware drivers */ -#define CONFIG_DRIVER_SMC91111 -#define CONFIG_SMC91111_BASE 0x04000300 - -/* -* NS16550 Configuration -*/ #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4)#define CONFIG_SYS_NS16550_CLK (CONFIG_XTAL_FREQ)/* can be 12M/32Khz or 48Mhz */ -#define CONFIG_SYS_NS16550_COM1 OMAP1510_UART1_BASE/* uart1 */ +#define CONFIG_SYS_NS16550_COM1 OMAP1510_UART1_BASE/* uart1 */ + +#define CONFIG_DRIVER_SMC91111 +#define CONFIG_SMC91111_BASE 0x04000300 -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define CONFIG_SYS_NAND_BASE 0x04000000 + (2 << 23) +#define NAND_ALLOW_ERASE_ALL 1 + + +#define CONFIG_CONS_INDEX 1 +#define CONFIG_BAUDRATE 115200#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }/*#define CONFIG_SKIP_RELOCATE_UBOOT*/ /*#define CONFIG_SKIP_LOWLEVEL_INIT */ /* -* NAND flash -*/ -#define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE 0x04000000 + (2 << 23) -#define NAND_ALLOW_ERASE_ALL 1 - -/* * partitions (mtdparts command line support) */ #define CONFIG_JFFS2_CMDLINE
@@ -136,7 +131,6 @@/* * Command line configuration. */ -#define CONFIG_CMD_BDI #define CONFIG_CMD_BOOTD #define CONFIG_CMD_DHCP
PATCH 2/5 NetStar: Fix NAND
In reply to Ladislav MichlFix NAND support broken during new NAND code merge. Move those few lines of code to board/netstar/netstar.c
board/netstar/Makefile +1 -1
@@ -28,7 +28,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS := netstar.o flash.o nand.o +COBJS := netstar.o flash.o SOBJS := setup.o crcek.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) eeprom.c \
board/netstar/nand.c deleted +0 -62
62 lines not on this page · raw message
board/netstar/netstar.c +36 -1
@@ -1,5 +1,5 @@/* -* (C) Copyright 2005 2N TELEKOMUNIKACE, Ladislav Michl +* (C) Copyright 2005,2009 2N TELEKOMUNIKACE, Ladislav Michl * * See file CREDITS for list of people who contributed to this * project.
@@ -21,6 +21,9 @@*/ #include <common.h> +#include <nand.h> + +#include <asm/io.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -59,3 +62,35 @@ int board_late_init(void) {return 0 ; } + +#if defined(CONFIG_CMD_NAND ) +/* +* hardware specific access to control-lines +* +* NAND_NCE: bit 0 - don't care +* NAND_CLE: bit 1 -> bit 1 (0x0002) +* NAND_ALE: bit 2 -> bit 2 (0x0004) +*/ +static void netstar_nand_hwcontrol (struct mtd_info *mtd,int cmd,unsigned int ctrl) +{ +struct nand_chip *chip = mtd->priv; +unsigned long mask; + +if (cmd ==NAND_CMD_NONE ) +return ; + + mask = (ctrl &NAND_CLE ) ?0x02 :0 ; +if (ctrl &NAND_ALE ) + mask |=0x04 ; +writeb (cmd, (unsigned long )chip->IO_ADDR_W | mask); +} + +int board_nand_init (struct nand_chip *nand) +{ + nand->options =NAND_SAMSUNG_LP_OPTIONS ; + nand->ecc.mode =NAND_ECC_SOFT ; + nand->cmd_ctrl = netstar_nand_hwcontrol; + nand->chip_delay =400 ; +return 0 ; +} +#endif
PATCH 3/5 NetStar: use generic flash driver
In reply to Ladislav MichlUse generic flash driver.
include/configs/netstar.h +10 -10
@@ -59,16 +59,6 @@#define PHYS_SDRAM_1_SIZE (64 * 1024 * 1024)#define PHYS_FLASH_1 0x00000000/* Flash Bank #1 */ -/* -* FLASH organization -*/ -#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define PHYS_FLASH_1_SIZE (1 * 1024 * 1024) -#define CONFIG_SYS_MAX_FLASH_SECT 19 -#define CONFIG_SYS_FLASH_ERASE_TOUT (5*CONFIG_SYS_HZ)/* in ticks */ -#define CONFIG_SYS_FLASH_WRITE_TOUT (5*CONFIG_SYS_HZ) -#define CONFIG_SYS_MONITOR_BASE PHYS_FLASH_1#define CONFIG_SYS_MONITOR_LEN (256 * 1024)
@@ -106,6 +96,16 @@#define CONFIG_DRIVER_SMC91111 #define CONFIG_SMC91111_BASE 0x04000300 +#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_SECT 19 + +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_FLASH_CFI_DRIVER +#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT +#define CONFIG_FLASH_CFI_LEGACY +#define CONFIG_SYS_FLASH_LEGACY_512Kx16 +#define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_BASE 0x04000000 + (2 << 23)#define NAND_ALLOW_ERASE_ALL 1
board/netstar/netstar.c +14 -0
@@ -21,6 +21,7 @@*/ #include <common.h> +#include <flash.h> #include <nand.h> #include <asm/io.h>
@@ -63,6 +64,19 @@return 0 ; } +#if defined(CONFIG_CMD_FLASH ) +ulong board_flash_get_legacy (ulong base,int banknum,flash_info_t * info) +{ +if (banknum ==0 ) {/* AM29LV800 boot flash */ + info->portwidth =FLASH_CFI_16BIT ; + info->chipwidth =FLASH_CFI_BY16 ; + info->interface =FLASH_CFI_X16 ; +return 1 ; + }else +return 0 ; +} +#endif +#if defined(CONFIG_CMD_NAND )/* * hardware specific access to control-lines
board/netstar/flash.c deleted +0 -343
343 lines not on this page · raw message
board/netstar/Makefile +1 -1
@@ -28,7 +28,7 @@ LIB = $(obj)lib$(BOARD).a -COBJS := netstar.o flash.o +COBJS := netstar.o SOBJS := setup.o crcek.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) eeprom.c \
PATCH 4/5 NetStar: add RTC support
In reply to Ladislav MichlAdd RTC support.
include/configs/netstar.h +9 -0
@@ -110,6 +110,14 @@#define CONFIG_SYS_NAND_BASE 0x04000000 + (2 << 23)#define NAND_ALLOW_ERASE_ALL 1 +#define CONFIG_HARD_I2C +#define CONFIG_SYS_I2C_SPEED 100000 +#define CONFIG_SYS_I2C_SLAVE 1 +#define CONFIG_DRIVER_OMAP1510_I2C + +#define CONFIG_RTC_DS1307 +#define CONFIG_SYS_I2C_RTC_ADDR 0x68 +#define CONFIG_CONS_INDEX 1#define CONFIG_BAUDRATE 115200
@@ -133,6 +141,7 @@*/ #define CONFIG_CMD_BDI #define CONFIG_CMD_BOOTD +#define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_SAVEENV #define CONFIG_CMD_FLASH
board/netstar/netstar.c +5 -0
@@ -22,6 +22,7 @@#include <common.h> #include <flash.h> +#include <i2c.h> #include <nand.h> #include <asm/io.h>
@@ -56,6 +57,10 @@int misc_init_r (void ) { +#if defined(CONFIG_RTC_DS1307 ) +/* enable trickle charge */ +i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR ,0x10 ,0xaa ); +#endif return 0 ; }
PATCH 5/5 NetStar: update crcit utility
In reply to Ladislav MichlMake crc32 function to match its prototype. Use more meaningful identifiers.
board/netstar/crcit.c +7 -7
@@ -31,11 +31,11 @@#include <sys/stat.h> #include "crcek.h" -extern unsigned long crc32 (unsigned long ,const unsigned char *,unsigned int ); +extern uint32_t crc32 (uint32_t ,const unsigned char *,uint ); -uint32_t data[LOADER_SIZE /4 +3 ]; +static uint32_t data[LOADER_SIZE /4 +3 ]; -int doit (char *path,unsigned version) +static int do_crc (char *path,unsigned version) {uint32_t *p;ssize_t size;
@@ -56,10 +56,10 @@ int doit(char *path, unsigned version)fprintf (stderr,"File too large\n" );return EXIT_FAILURE ; } - size = (((size -1 ) >>2 ) +1 ) <<2 ; + size = (size +3 ) & ~3 ;/* round up to 4 bytes */ data[0 ] = size +4 ;/* add size of version field */ data[1 ] = version; - data[(size >>2 ) +2 ] =crc32 (0 , (unsigned char *)(data +1 ), data[0 ]); + data[2 + (size >>2 )] =crc32 (0 , (unsigned char *)(data +1 ), data[0 ]);close (fd);if (write (STDOUT_FILENO , data, size +3 *4 ) ==-1 ) {
@@ -73,12 +73,12 @@ int doit(char *path, unsigned version)int main (int argc,char **argv) {if (argc ==2 ) { -return doit (argv[1 ],0 ); +return do_crc (argv[1 ],0 ); }else if ((argc ==4 ) && (strcmp (argv[1 ],"-v" ) ==0 )) {char *endptr, *nptr = argv[2 ];unsigned ver =strtoul (nptr, &endptr,0 );if (*nptr !='\0' && *endptr =='\0' ) -return doit (argv[3 ], ver); +return do_crc (argv[3 ], ver); }fprintf (stderr,"Usage: crcit [-v version] <image>\n" );
PATCH 2/5 NetStar: Fix NAND
In reply to Ladislav MichlQuoted 2 lines · Ladislav Michl
Fix NAND support broken during new NAND code merge. Move those few lines of code to
board/netstar/netstar.c
What was the breakage?
Quoted 23 lines
board/netstar/nand.c deleted +0
-23-/* -* hardware specific access to control-lines -*/ -#define MASK_CLE 0x02 -#define MASK_ALE 0x04 - -static void netstar_nand_hwcontrol (struct mtd_info *mtd,int cmd,unsigned int ctrl) -{ -struct nand_chip *this = mtd->priv; -ulong IO_ADDR_W = (ulong ) this->IO_ADDR_W; - -IO_ADDR_W &= ~(MASK_ALE |MASK_CLE ); -if (ctrl &NAND_CTRL_CHANGE ) { -if ( ctrl &NAND_CLE ) -IO_ADDR_W |=MASK_CLE ; -if ( ctrl &NAND_ALE ) -IO_ADDR_W |=MASK_ALE ; - } - this->IO_ADDR_W = (void __iomem *)IO_ADDR_W ; - -if (cmd !=NAND_CMD_NONE ) -writeb (cmd, this->IO_ADDR_W); -}
[snip]
Quoted 11 lines
board/netstar/netstar.c +11
-0+#if defined(CONFIG_CMD_NAND ) +/* +* hardware specific access to control-lines +* +* NAND_NCE: bit 0 - don't care +* NAND_CLE: bit 1 -> bit 1 (0x0002) +* NAND_ALE: bit 2 -> bit 2 (0x0004) +*/ +static void netstar_nand_hwcontrol (struct mtd_info *mtd,int cmd,unsigned int ctrl) +{ +struct nand_chip *chip = mtd->priv;
board/netstar/netstar.c int board_late_init(void) · line 86
Quoted 10 lines
board/netstar/netstar.c +10
-0+unsigned long mask; + +if (cmd ==NAND_CMD_NONE ) +return ; + + mask = (ctrl &NAND_CLE ) ?0x02 :0 ; +if (ctrl &NAND_ALE ) + mask |=0x04 ; +writeb (cmd, (unsigned long )chip->IO_ADDR_W | mask); +}
Do not pass integers as addresses.
The new function looks functionally identical to the old one (except that it ignores the interface in a couple of ways that it didn't before, but which don't really matter). Why the change? Why the difference between CLE using ?: and ALE using an if-statement?
-Scott
PATCH 2/5 NetStar: Fix NAND
In reply to Ladislav MichlQuoted 8 lines · Ladislav Michl
Quoted 4 lines · Scott Wood
Quoted 2 lines · Ladislav Michl
Fix NAND support broken during new NAND code merge. Move those few lines of code to
board/netstar/netstar.cWhat was the breakage?
Blocks being considered bad during read. I did not make any deeper analysis, just copied proven code.
I think I see the issue -- if NAND_CTRL_CHANGE is not set, it will reset IO_ADDR_W rather than leaving it alone. There's also a bug for 64-bit platforms if I/O is over 4GiB, but that's not applicable here.
Quoted 10 lines
The code above is identical to that found in linux driver. I'm considering useful to keep it in sync for sake of easier future upgrades. Sure it could be written as
if (ctrl &NAND_CLE)mask = 0x02; else mask = 0; if (ctrl & NAND_ALE) mask |= 0x04;but the former is a bit shorter.
I was thinking more along the lines of:
unsigned long mask = 0;
if (ctrl & NAND_CLE)
mask |= 2; if (ctrl & NAND_ALE) mask |= 4;
...simple and symmetric. But it doesn't matter overly much; keeping in sync with the Linux driver is more important.
ACK, though I would like to see the argument to writeb cast to a pointer before passing it (or else you'll get warnings if the accessor ever changes from a macro to an inline function).
-Scott
PATCH 2/5 NetStar: Fix NAND
In reply to Scott WoodQuoted 5 lines · Scott Wood
Quoted 2 lines · Ladislav Michl
Fix NAND support broken during new NAND code merge. Move those few lines of code to
board/netstar/netstar.cWhat was the breakage?
Blocks being considered bad during read. I did not make any deeper analysis, just copied proven code.
Quoted 16 lines
board/netstar/netstar.c int board_late_init(void) · line 86
Quoted 13 lines
board/netstar/netstar.c +13
-0+static void netstar_nand_hwcontrol (struct mtd_info *mtd,int cmd,unsigned int ctrl) +{ +struct nand_chip *chip = mtd->priv; +unsigned long mask; + +if (cmd ==NAND_CMD_NONE ) +return ; + + mask = (ctrl &NAND_CLE ) ?0x02 :0 ; +if (ctrl &NAND_ALE ) + mask |=0x04 ; +writeb (cmd, (unsigned long )chip->IO_ADDR_W | mask); +}Do not pass integers as addresses.
Quoted 4 lines
The new function looks functionally identical to the old one (except that it ignores the interface in a couple of ways that it didn't before, but which don't really matter). Why the change? Why the difference between CLE using ?: and ALE using an if-statement?
The code above is identical to that found in linux driver. I'm considering useful to keep it in sync for sake of easier future upgrades. Sure it could be written as
if (ctrl & NAND_CLE)
mask = 0x02; else mask = 0; if (ctrl & NAND_ALE) mask |= 0x04;
but the former is a bit shorter.
Best regards,
ladis
Wolfgang Denk
AppliedPATCH 1/5 NetStar: config reindentation
In reply to Ladislav MichlDear Ladislav Michl,
Quoted 3 lines · In message <[email protected]> you wrote:
Fix indentation broken by symbol renames. "Sort" driver related definitons.
Signed-off-by Ladislav Michl <[email protected]>
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Hokey religions and ancient weapons are no substitute for a good blaster at your side. - Han Solo
PATCH 3/5 NetStar: use generic flash driver
In reply to Ladislav MichlDear Ladislav Michl,
Quoted 3 lines · In message <[email protected]> you wrote:
Use generic flash driver.
Signed-off-by Ladislav Michl <[email protected]>
Does not apply to me:
Applying: NetStar: use generic flash driver
error: patch failed: include/configs/netstar.h:106
error: include/configs/netstar.h: patch does not apply
error: patch failed: board/netstar/netstar.c:21
error: board/netstar/netstar.c: patch does not apply
error: patch failed: board/netstar/Makefile:28
error: board/netstar/Makefile: patch does not apply
fatal: sha1 information is lacking or useless (include/configs/netstar.h).
Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge.
Patch failed at 0001.
Best regards,
Wolfgang Denk
Signature · 8 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "The release of emotion is what keeps us health. Emotionally healthy." "That may be, Doctor. However, I have noted that the healthy release of emotion is frequently unhealthy for those closest to you." -- McCoy and Spock, "Plato's Stepchildren", stardate 5784.3
PATCH 3/5 NetStar: use generic flash driver
Dear Wolfgang,
Quoted 6 lines · Wolfgang Denk
Quoted 3 lines · In message <[email protected]> you wrote:
Use generic flash driver.
Signed-off-by Ladislav Michl <[email protected]>Does not apply to me:
I'm sorry for that. Updated version follows.
board/netstar/Makefile +1 -1
@@ -28,7 +28,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS := netstar.o flash.o +COBJS := netstar.o SOBJS := setup.o crcek.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) eeprom.c \
board/netstar/flash.c deleted +0 -343
343 lines not on this page · raw message
board/netstar/netstar.c +14 -0
@@ -21,6 +21,7 @@*/ #include <common.h> +#include <flash.h> #include <nand.h> #include <asm/io.h>
@@ -63,6 +64,19 @@ int board_late_init(void)return 0 ; } +#if defined(CONFIG_CMD_FLASH ) +ulong board_flash_get_legacy (ulong base,int banknum,flash_info_t * info) +{ +if (banknum ==0 ) {/* AM29LV800 boot flash */ + info->portwidth =FLASH_CFI_16BIT ; + info->chipwidth =FLASH_CFI_BY16 ; + info->interface =FLASH_CFI_X16 ; +return 1 ; + }else +return 0 ; +} +#endif +#if defined(CONFIG_CMD_NAND )/* * hardware specific access to control-lines
include/configs/netstar.h +10 -10
@@ -59,16 +59,6 @@#define PHYS_SDRAM_1_SIZE (64 * 1024 * 1024)#define PHYS_FLASH_1 0x00000000/* Flash Bank #1 */ -/* -* FLASH organization -*/ -#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define PHYS_FLASH_1_SIZE (1 * 1024 * 1024) -#define CONFIG_SYS_MAX_FLASH_SECT 19 -#define CONFIG_SYS_FLASH_ERASE_TOUT (5*CONFIG_SYS_HZ)/* in ticks */ -#define CONFIG_SYS_FLASH_WRITE_TOUT (5*CONFIG_SYS_HZ) -#define CONFIG_SYS_MONITOR_BASE PHYS_FLASH_1#define CONFIG_SYS_MONITOR_LEN (256 * 1024)
@@ -106,6 +96,16 @@#define CONFIG_DRIVER_SMC91111 #define CONFIG_SMC91111_BASE 0x04000300 +#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_SECT 19 + +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_FLASH_CFI_DRIVER +#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT +#define CONFIG_FLASH_CFI_LEGACY +#define CONFIG_SYS_FLASH_LEGACY_512Kx16 +#define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_BASE 0x04000000 + (2 << 23)#define NAND_ALLOW_ERASE_ALL 1