mxc_ipuv3: fix memory alignment of framebuffer

[karo-tx-uboot.git] / board / quad100hd / quad100hd.c

diff --git a/board/quad100hd/quad100hd.c b/board/quad100hd/quad100hd.c
index 638bd6ca220dcad1fcf5da019c6dd7e36e391c59..6044e85585a8b603b459c2fe0f9774528a698561 100644 (file)
--- a/board/quad100hd/quad100hd.c
+++ b/board/quad100hd/quad100hd.c
@@ -33,20 +33,20 @@
 
 #include <asm/processor.h>
 #include <asm/io.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 int board_early_init_f(void)
 {
        /* taken from PPCBoot */
-       mtdcr(uicsr, 0xFFFFFFFF);       /* clear all ints */
-       mtdcr(uicer, 0x00000000);       /* disable all ints */
-       mtdcr(uiccr, 0x00000000);
-       mtdcr(uicpr, 0xFFFF7FFE);       /* set int polarities */
-       mtdcr(uictr, 0x00000000);       /* set int trigger levels */
-       mtdcr(uicsr, 0xFFFFFFFF);       /* clear all ints */
-       mtdcr(uicvcr, 0x00000001);      /* set vect base=0,INT0 highest priority */
+       mtdcr(UIC0SR, 0xFFFFFFFF);      /* clear all ints */
+       mtdcr(UIC0ER, 0x00000000);      /* disable all ints */
+       mtdcr(UIC0CR, 0x00000000);
+       mtdcr(UIC0PR, 0xFFFF7FFE);      /* set int polarities */
+       mtdcr(UIC0TR, 0x00000000);      /* set int trigger levels */
+       mtdcr(UIC0SR, 0xFFFFFFFF);      /* clear all ints */
+       mtdcr(UIC0VCR, 0x00000001);     /* set vect base=0,INT0 highest priority */
 
        mtdcr(CPC0_SRR, 0x00040000);   /* Hold PCI bridge in reset */
 
@@ -58,16 +58,17 @@ int board_early_init_f(void)
  */
 int checkboard(void)
 {
-       char *s = getenv("serial#");
+       char buf[64];
+       int i = getenv_f("serial#", buf, sizeof(buf));
 #ifdef DISPLAY_BOARD_INFO
        sys_info_t sysinfo;
 #endif
 
        puts("Board: Quad100hd");
 
-       if (s != NULL) {
+       if (i > 0) {
                puts(", serial# ");
-               puts(s);
+               puts(buf);
        }
        putc('\n');
 
@@ -86,8 +87,3 @@ int checkboard(void)
 
        return 0;
 }
-
-long int initdram(int board_type)
-{
-       return CFG_SDRAM_SIZE;
-}