Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash

[karo-tx-uboot.git] / board / amcc / bamboo / bamboo.h

diff --git a/board/amcc/bamboo/bamboo.h b/board/amcc/bamboo/bamboo.h
index 447486297a8232fa20d2a02e0bc6c1f069903ca4..6c49733639b5e02bd1ae9a54ec026933d0840c21 100644 (file)
--- a/board/amcc/bamboo/bamboo.h
+++ b/board/amcc/bamboo/bamboo.h
@@ -110,17 +110,6 @@
 /*----------------------------------------------------------------------------+
 | SDR Configuration registers
 +----------------------------------------------------------------------------*/
-/* Serial Device Strap Reg 0 */
-#define SDR0_SDSTP0                 0x0020
-/* Serial Device Strap Reg 1 */
-#define SDR0_SDSTP1                 0x0021
-/* Serial Device Strap Reg 2 */
-#define SDR0_SDSTP2                 SDR0_STRP2
-/* Serial Device Strap Reg 3 */
-#define SDR0_SDSTP3                 SDR0_STRP3
-
-#define sdr_pstrp0                  0x0040
-
 #define          SDR0_SDSTP1_EBC_ROM_BS_MASK  0x00006000  /* EBC Boot Size Mask */
 #define          SDR0_SDSTP1_EBC_ROM_BS_32BIT 0x00004000    /* EBC 32 bits */
 #define          SDR0_SDSTP1_EBC_ROM_BS_16BIT 0x00002000    /* EBC 16 Bits */
@@ -261,9 +250,6 @@
 #define         PVR_POWERPC_440EP_PASS1    0x42221850
 #define         PVR_POWERPC_440EP_PASS2    0x422218D3
 
-#define TRUE 1
-#define FALSE 0
-
 #define GPIO0          0
 #define GPIO1          1