imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

[karo-tx-uboot.git] / board / altera / dk1c20 / dk1c20.c

diff --git a/board/altera/dk1c20/dk1c20.c b/board/altera/dk1c20/dk1c20.c
index 98ee7a71c962af93b8504b830e3b5ffa3c0eb16c..11c19b7eedb252773e9521b8547c136bc9f84350 100755 (executable)
--- a/board/altera/dk1c20/dk1c20.c
+++ b/board/altera/dk1c20/dk1c20.c
@@ -50,17 +50,17 @@ int checkboard (void)
        return 0;
 }
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        return (0);
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_IDE)
+#if defined(CONFIG_CMD_IDE)
 int ide_preinit (void)
 {
-       nios_pio_t *present = (nios_pio_t *) CFG_CF_PRESENT;
-       nios_pio_t *power = (nios_pio_t *) CFG_CF_POWER;
-       nios_pio_t *atasel = (nios_pio_t *) CFG_CF_ATASEL;
+       nios_pio_t *present = (nios_pio_t *) CONFIG_SYS_CF_PRESENT;
+       nios_pio_t *power = (nios_pio_t *) CONFIG_SYS_CF_POWER;
+       nios_pio_t *atasel = (nios_pio_t *) CONFIG_SYS_CF_ATASEL;
 
        /* setup data direction registers */
        present->direction = NIOS_PIO_IN;
@@ -78,4 +78,4 @@ int ide_preinit (void)
 
        return 0;
 }
-#endif /* CONFIG_COMMANDS & CFG_CMD_IDE */
+#endif