From b8e16a3450fb9853a8b0ff617d70f1121b32c4c0 Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@pollux.denx.de>
Date: Thu, 6 Oct 2005 23:44:55 +0200
Subject: [PATCH] Cleanup
---
board/armadillo/flash.c | 4 +++-
board/integratorap/split_by_variant.sh | 6 +++---
board/integratorcp/split_by_variant.sh | 6 +++---
board/omap2420h4/omap2420h4.c | 18 ------------------
board/versatile/split_by_variant.sh | 6 +++---
include/asm-arm/arch-arm1136/omap2420.h | 2 +-
6 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/board/armadillo/flash.c b/board/armadillo/flash.c
index f25a8e7bba6..037a6430dab 100644
--- 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 23fc7b32441..1c5f0974ed2 100755
--- 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 3f6363314af..6e21b7df63b 100755
--- 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 c729eca0154..6ae1a490a50 100644
--- 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 b462b7e1f5f..ea705da1c61 100755
--- 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 7a7aae6b0e1..d833035a4b3 100644
--- 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
--
GitLab