Merge git://git.denx.de/u-boot-x86

[u-boot] / board / zipitz2 / zipitz2.c

diff --git a/board/zipitz2/zipitz2.c b/board/zipitz2/zipitz2.c
index f7edc4c8cabe3189e0d4bd426726965c980e1e20..90bba6a5fc18cd2513e0adee6f6307385be513cd 100644 (file)
--- a/board/zipitz2/zipitz2.c
+++ b/board/zipitz2/zipitz2.c
@@ -4,29 +4,15 @@
  *
  * Heavily based on pxa255_idp platform
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <command.h>
 #include <serial.h>
 #include <asm/arch/hardware.h>
+#include <asm/arch/pxa.h>
+#include <asm/arch/regs-mmc.h>
 #include <spi.h>
 #include <asm/io.h>
 
@@ -44,10 +30,11 @@ inline void lcd_start(void) {};
 
 int board_init (void)
 {
-       /* memory and cpu-speed are setup before relocation */
-       /* so we do _nothing_ here */
+       /* We have RAM, disable cache */
+       dcache_disable();
+       icache_disable();
 
-       /* arch number of Lubbock-Board */
+       /* arch number of Z2 */
        gd->bd->bi_arch_number = MACH_TYPE_ZIPIT2;
 
        /* adress of boot parameters */
@@ -59,25 +46,26 @@ int board_init (void)
        return 0;
 }
 
-int board_late_init(void)
+int dram_init(void)
 {
-       setenv("stdout", "serial");
-       setenv("stderr", "serial");
+       pxa2xx_dram_init();
+       gd->ram_size = PHYS_SDRAM_1_SIZE;
        return 0;
 }
 
-struct serial_device *default_serial_console (void)
-{
-       return &serial_stuart_device;
-}
-
-int dram_init (void)
+void dram_init_banksize(void)
 {
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
+}
 
+#ifdef CONFIG_CMD_MMC
+int board_mmc_init(bd_t *bis)
+{
+       pxa_mmc_register(0);
        return 0;
 }
+#endif
 
 #ifdef CONFIG_CMD_SPI