From: Wolfgang Denk <wd@denx.de>
Date: Sat, 13 Oct 2007 19:40:23 +0000 (+0200)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-nand-flash
X-Git-Tag: v2008.10-rc1~896^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=23c56f97caa3b585ab1290f0e7895f0f9e82113f;hp=-c;p=platform%2Fkernel%2Fu-boot.git

Merge branch 'master' of git://denx.de/git/u-boot-nand-flash
---

23c56f97caa3b585ab1290f0e7895f0f9e82113f
diff --combined Makefile
index 8d500f5,c35f022..5fe67fc
--- a/Makefile
+++ b/Makefile
@@@ -24,7 -24,7 +24,7 @@@
  VERSION = 1
  PATCHLEVEL = 3
  SUBLEVEL = 0
 -EXTRAVERSION = -rc1
 +EXTRAVERSION = -rc2
  U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  VERSION_FILE = $(obj)include/version_autogenerated.h
  
@@@ -211,6 -211,7 +211,7 @@@ LIBS += drivers/libdrivers.
  LIBS += drivers/bios_emulator/libatibiosemu.a
  LIBS += drivers/nand/libnand.a
  LIBS += drivers/nand_legacy/libnand_legacy.a
+ LIBS += drivers/onenand/libonenand.a
  LIBS += drivers/net/libnet.a
  ifeq ($(CPU),mpc83xx)
  LIBS += drivers/qe/qe.a
@@@ -319,7 -320,7 +320,7 @@@ updater
  env:
  		$(MAKE) -C tools/env all || exit 1
  
 -depend dep:
 +depend dep:	version
  		for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir _depend ; done
  
  tags ctags:
@@@ -1961,7 -1962,7 +1962,7 @@@ TQM8560_config:		unconfi
  	echo "#define CONFIG_TQM$${CTYPE}">>$(obj)include/config.h; \
  	echo "#define CONFIG_HOSTNAME tqm$${CTYPE}">>$(obj)include/config.h; \
  	echo "#define CONFIG_BOARDNAME \"TQM$${CTYPE}\"">>$(obj)include/config.h; \
 -	echo "#define CFG_BOOTFILE \"bootfile=/tftpboot/tqm$${CTYPE}/uImage\0\"">>$(obj)include/config.h
 +	echo "#define CFG_BOOTFILE_PATH \"/tftpboot/tqm$${CTYPE}/uImage\"">>$(obj)include/config.h
  	@$(MKCONFIG) -a TQM85xx ppc mpc85xx tqm85xx
  
  #########################################################################
diff --combined include/config_cmd_all.h
index 77ea025,f8eca87..d7ef65d
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@@ -59,6 -59,7 +59,7 @@@
  #define CONFIG_CMD_NAND		/* NAND support			*/
  #define CONFIG_CMD_NET		/* bootp, tftpboot, rarpboot	*/
  #define CONFIG_CMD_NFS		/* NFS support			*/
+ #define CONFIG_CMD_ONENAND	/* OneNAND support		*/
  #define CONFIG_CMD_PCI		/* pciinfo			*/
  #define CONFIG_CMD_PCMCIA	/* PCMCIA support		*/
  #define CONFIG_CMD_PING		/* ping support			*/
@@@ -76,6 -77,6 +77,6 @@@
  #define CONFIG_CMD_USB		/* USB Support			*/
  #define CONFIG_CMD_VFD		/* VFD support (TRAB)		*/
  #define CONFIG_CMD_XIMG		/* Load part of Multi Image	*/
 -#define CONFIG_CMD_MUX		/* AT91 MMC/SPI Mux Support     */
 +#define CONFIG_CMD_AT91_SPIMUX	/* AT91 MMC/SPI Mux Support     */
  
  #endif	/* _CONFIG_CMD_ALL_H */
diff --combined lib_arm/board.c
index af0233a,634e4d9..7e97f13
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@@ -58,6 -58,10 +58,10 @@@ DECLARE_GLOBAL_DATA_PTR
  void nand_init (void);
  #endif
  
+ #if defined(CONFIG_CMD_ONENAND)
+ void onenand_init(void);
+ #endif
+ 
  ulong monitor_flash_len;
  
  #ifdef CONFIG_HAS_DATAFLASH
@@@ -112,26 -116,6 +116,26 @@@ void *sbrk (ptrdiff_t increment
  }
  
  /************************************************************************
 + * Coloured LED functionality
 + ************************************************************************
 + * May be supplied by boards if desired
 + */
 +void inline __coloured_LED_init (void) {}
 +void inline coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init")));
 +void inline __red_LED_on (void) {}
 +void inline red_LED_on (void) __attribute__((weak, alias("__red_LED_on")));
 +void inline __red_LED_off(void) {}
 +void inline red_LED_off(void)	     __attribute__((weak, alias("__red_LED_off")));
 +void inline __green_LED_on(void) {}
 +void inline green_LED_on(void) __attribute__((weak, alias("__green_LED_on")));
 +void inline __green_LED_off(void) {}
 +void inline green_LED_off(void)__attribute__((weak, alias("__green_LED_off")));
 +void inline __yellow_LED_on(void) {}
 +void inline yellow_LED_on(void)__attribute__((weak, alias("__yellow_LED_on")));
 +void inline __yellow_LED_off(void) {}
 +void inline yellow_LED_off(void)__attribute__((weak, alias("__yellow_LED_off")));
 +
 +/************************************************************************
   * Init Utilities							*
   ************************************************************************
   * Some of this code should be moved into the core functions,
@@@ -205,6 -189,7 +209,6 @@@ static void display_flash_config (ulon
  }
  #endif /* CFG_NO_FLASH */
  
 -
  /*
   * Breathe some life into the board...
   *
@@@ -320,6 -305,10 +324,10 @@@ void start_armboot (void
  	nand_init();		/* go init the NAND */
  #endif
  
+ #if defined(CONFIG_CMD_ONENAND)
+ 	onenand_init();
+ #endif
+ 
  #ifdef CONFIG_HAS_DATAFLASH
  	AT91F_DataflashInit();
  	dataflash_print_info();