Merge branch 'master' into next

[u-boot] / board / kup / common / kup.c

diff --git a/board/kup/common/kup.c b/board/kup/common/kup.c
index d018e3cc5d73935dc6195f7640566cee53519b2f..2418d59d866c6a0b945321eadd6da87671e9d76f 100644 (file)
--- a/board/kup/common/kup.c
+++ b/board/kup/common/kup.c
@@ -27,7 +27,7 @@
 
 int misc_init_f (void)
 {
-       volatile immap_t *immap = (immap_t *) CFG_IMMR;
+       volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
        volatile sysconf8xx_t *siu = &immap->im_siu_conf;
 
        while (siu->sc_sipend & 0x20000000) {
@@ -47,7 +47,7 @@ int misc_init_f (void)
 #ifdef CONFIG_IDE_LED
 void ide_led (uchar led, uchar status)
 {
-       volatile immap_t *immap = (immap_t *) CFG_IMMR;
+       volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
 
        /* We have one led for both pcmcia slots */
        if (status) {           /* led on */
@@ -60,7 +60,7 @@ void ide_led (uchar led, uchar status)
 
 void poweron_key (void)
 {
-       volatile immap_t *immap = (immap_t *) CFG_IMMR;
+       volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
 
        immap->im_ioport.iop_pcpar &= ~(PC_SWITCH1);
        immap->im_ioport.iop_pcdir &= ~(PC_SWITCH1);
@@ -70,14 +70,3 @@ void poweron_key (void)
        else
                setenv ("key1", "on");
 }
-
-#ifdef CONFIG_POST
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed (void)
-{
-       return (0);
-}
-#endif