mtd/cfi_flash: fix write problems for Numonyx P33/30 32 MBit flashs

[u-boot] / board / sheldon / simpc8313 / simpc8313.c

diff --git a/board/sheldon/simpc8313/simpc8313.c b/board/sheldon/simpc8313/simpc8313.c
index 0235545ae47d1dd82520a35a5550628140e5f751..9126c42d8ecc6536d7db42e4333a4b6bff354ed0 100644 (file)
--- a/board/sheldon/simpc8313/simpc8313.c
+++ b/board/sheldon/simpc8313/simpc8313.c
@@ -33,13 +33,13 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#ifndef CONFIG_NAND_SPL
 int checkboard(void)
 {
        puts("Board: Sheldon Instruments SIMPC8313\n");
        return 0;
 }
 
-#ifndef CONFIG_NAND_SPL
 static struct pci_region pci_regions[] = {
        {
                bus_start: CONFIG_SYS_PCI1_MEM_BASE,
@@ -67,7 +67,6 @@ void pci_init_board(void)
        volatile clk83xx_t *clk = (volatile clk83xx_t *)&immr->clk;
        volatile law83xx_t *pci_law = immr->sysconf.pcilaw;
        struct pci_region *reg[] = { pci_regions };
-       int warmboot;
 
        /* Enable all 3 PCI_CLK_OUTPUTs. */
        clk->occr |= 0xe0000000;
@@ -81,9 +80,7 @@ void pci_init_board(void)
        pci_law[1].bar = CONFIG_SYS_PCI1_IO_PHYS & LAWBAR_BAR;
        pci_law[1].ar = LBLAWAR_EN | LBLAWAR_1MB;
 
-       warmboot = gd->bd->bi_bootflags & BOOTFLAG_WARM;
-
-       mpc83xx_pci_init(1, reg, warmboot);
+       mpc83xx_pci_init(1, reg);
 }
 
 /*
@@ -93,7 +90,7 @@ int misc_init_r(void)
 {
        int rc = 0;
        immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
-       fsl_lbus_t *lbus = &immap->lbus;
+       fsl_lbc_t *lbus = &immap->im_lbc;
        u32 *mxmr = &lbus->mamr;        /* Pointer to mamr */
 
        /* UPM Table Configuration Code */