Merge with /home/tur/proj/051_uboot_linux_v38b/u-boot

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

diff --git a/board/omap730p2/omap730p2.c b/board/omap730p2/omap730p2.c
index 585b6ee56fbd9be0402b0f5b02d500a8d100cb30..309d667585abfd3cadc0559b6d0d0ca8a79f9aa1 100644 (file)
--- a/board/omap730p2/omap730p2.c
+++ b/board/omap730p2/omap730p2.c
@@ -34,6 +34,8 @@
 #include <./configs/omap730.h>
 #endif
 
+DECLARE_GLOBAL_DATA_PTR;
+
 int test_boot_mode(void);
 void spin_up_leds(void);
 void flash__init (void);
@@ -84,13 +86,8 @@ void toggle_backup_led(void)
 
 int board_init (void)
 {
-       volatile unsigned int *IOConfReg;
-
-
-       DECLARE_GLOBAL_DATA_PTR;
-
        /* arch number of OMAP 730 P2 Board - Same as the Innovator! */
-       gd->bd->bi_arch_number = 491;
+       gd->bd->bi_arch_number = MACH_TYPE_OMAP_PERSEUS2;
 
        /* adress of boot parameters */
        gd->bd->bi_boot_params = 0x10000100;
@@ -100,14 +97,12 @@ int board_init (void)
 
        peripheral_power_enable ();
 
-
        /* Backup LED indication via GPIO_140 -> Red led if MUX correctly setup */
        toggle_backup_led();
 
        /* Hold GSM in reset until needed */
        *((volatile unsigned short *)M_CTL) &= ~1;
 
-
        /*
         *  CSx timings, GPIO Mux ... setup
         */
@@ -185,8 +180,6 @@ void ether__init (void)
 ******************************/
 int dram_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;