Cleanup

diff --git a/board/armadillo/flash.c b/board/armadillo/flash.c
index f25a8e7bba62483baf930813f7702c19a0b5f4a7..037a6430dabd7548efa9900fc1da86cfa758e88a 100644 (file)
--- a/board/armadillo/flash.c
+++ b/board/armadillo/flash.c
@@ -118,7 +118,9 @@ void flash_print_info (flash_info_t * info)
        }
        printf ("\n");
 
-      Done:
+/*
+Done:  ;
+*/
 }
 
 /*

diff --git a/board/integratorap/split_by_variant.sh b/board/integratorap/split_by_variant.sh
index 23fc7b32441ce57ca22095004341a207de9945ee..1c5f0974ed25630328d867c71f23543c57b6f332 100755 (executable)
--- a/board/integratorap/split_by_variant.sh
+++ b/board/integratorap/split_by_variant.sh
@@ -11,12 +11,12 @@ echo     " 1 /* Integrator/AP   */"                 >> tmp.fil
 # ---------------------------------------------------------
 #  Set the core module defines according to Core Module
 # ---------------------------------------------------------
-CC=$(CROSS_COMPILE)gcc
+CC=${CROSS_COMPILE}gcc
 cpu="arm_intcm"
 
 if [ "$2" == "" ]
 then
-       echo "$0:: No preprocessor parameter - using $(CROSS_COMPILE)gcc"
+       echo "$0:: No preprocessor parameter - using ${CROSS_COMPILE}gcc"
 else
        CC=$2
 fi
@@ -24,7 +24,7 @@ fi
 
 if [ "$1" == "" ]
 then
-       echo "$0:: No parameters - using $(CROSS_COMPILE)gcc arm_intcm"
+       echo "$0:: No parameters - using ${CROSS_COMPILE}gcc arm_intcm"
 else
        case "$1" in
        ap7_config              |       \

diff --git a/board/integratorcp/split_by_variant.sh b/board/integratorcp/split_by_variant.sh
index 3f6363314af3a7f3c03eed4184790ae294af64f8..6e21b7df63b48b798945885b70d12f41b653c4af 100755 (executable)
--- a/board/integratorcp/split_by_variant.sh
+++ b/board/integratorcp/split_by_variant.sh
@@ -11,12 +11,12 @@ echo     " 1 /* Integrator/CP   */"                 >> tmp.fil
 # ---------------------------------------------------------
 #  Set the core module defines according to Core Module
 # ---------------------------------------------------------
-CC=$(CROSS_COMPILE)gcc
+CC=${CROSS_COMPILE}gcc
 cpu="arm_intcm"
 
 if [ "$2" == "" ]
 then
-       echo "$0:: No preprocessor parameter - using $(CROSS_COMPILE)gcc"
+       echo "$0:: No preprocessor parameter - using ${CROSS_COMPILE}gcc"
 else
        CC=$2
 fi
@@ -24,7 +24,7 @@ fi
 
 if [ "$1" == "" ]
 then
-       echo "$0:: No parameters - using $(CROSS_COMPILE)gcc arm_intcm"
+       echo "$0:: No parameters - using ${CROSS_COMPILE}gcc arm_intcm"
 else
        case "$1" in
        cp966_config            |       \

diff --git a/board/omap2420h4/omap2420h4.c b/board/omap2420h4/omap2420h4.c
index c729eca01549e16b031470682e8bc113ff9319c0..6ae1a490a500424ba1d198104028b3cdc91c612f 100644 (file)
--- a/board/omap2420h4/omap2420h4.c
+++ b/board/omap2420h4/omap2420h4.c
@@ -64,24 +64,6 @@ int board_init (void)
        return 0;
 }
 
-/**********************************************************
- * Routine: try_unlock_sram()
- * Description: If chip is GP type, unlock the SRAM for
- *  general use.
- ***********************************************************/
-void try_unlock_sram(void)
-{
-       int mode;
-
-       /* if GP device unlock device SRAM for general use */
-       mode = (__raw_readl(CONTROL_STATUS) & (BIT8|BIT9));
-       if (mode == GP_DEVICE) {
-               __raw_writel(0xFF, A_REQINFOPERM0);
-               __raw_writel(0xCFDE, A_READPERM0);
-               __raw_writel(0xCFDE, A_WRITEPERM0);
-       }
-}
-
 /**********************************************************
  * Routine: try_unlock_sram()
  * Description: If chip is GP type, unlock the SRAM for

diff --git a/board/versatile/split_by_variant.sh b/board/versatile/split_by_variant.sh
index b462b7e1f5f790acc4e6c07dac47779613031daf..ea705da1c6114f148f500b53156cb48d094d007c 100755 (executable)
--- a/board/versatile/split_by_variant.sh
+++ b/board/versatile/split_by_variant.sh
@@ -2,12 +2,12 @@
 # ---------------------------------------------------------
 #  Set the core module defines according to Core Module
 # ---------------------------------------------------------
-CC=$(CROSS_COMPILE)gcc
+CC=${CROSS_COMPILE}gcc
 config="versatilepb_config"
 
 if [ "$2" == "" ]
 then
-       echo "$0:: No preprocessor parameter - using $(CROSS_COMPILE)gcc"
+       echo "$0:: No preprocessor parameter - using ${CROSS_COMPILE}gcc"
 else
        CC=$2
 fi
@@ -18,7 +18,7 @@ fi
 # ---------------------------------------------------------
 if [ "$1" == "" ]
 then
-       echo "$0:: No parameters - using $(CROSS_COMPILE)gcc versatilepb_config"
+       echo "$0:: No parameters - using ${CROSS_COMPILE}gcc versatilepb_config"
 
 else
        case "$config" in

diff --git a/include/asm-arm/arch-arm1136/omap2420.h b/include/asm-arm/arch-arm1136/omap2420.h
index 7a7aae6b0e1f32cdd23e1c767265b256ee7cfc90..d833035a4b34cb157921faf476cf2a5414ec3e54 100644 (file)
--- a/include/asm-arm/arch-arm1136/omap2420.h
+++ b/include/asm-arm/arch-arm1136/omap2420.h
@@ -35,7 +35,7 @@
 #define A_REQINFOPERM0        0x68005048
 #define A_READPERM0           0x68005050
 #define A_WRITEPERM0          0x68005058
-#define GP_DEVICE             (BIT8|BIT9)
+/* #define GP_DEVICE   (BIT8|BIT9)  FIXME -- commented out to make compile -- FIXME */
 
 /* L3 Firewall */
 #define A_REQINFOPERM0        0x68005048