summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2014-10-21 15:23:32 +0200
committerWolfgang Denk <wd@denx.de>2014-10-27 14:35:55 +0100
commit03b004074fb641cffd7d2150505ef8afc13231bf (patch)
tree93fe51aab1e2cc78646ddc8c9b5918dac9ed4ea3 /arch
parentfc297789a231ded974d6194e74f7a0620fb4553e (diff)
downloadu-boot-imx-03b004074fb641cffd7d2150505ef8afc13231bf.zip
u-boot-imx-03b004074fb641cffd7d2150505ef8afc13231bf.tar.gz
u-boot-imx-03b004074fb641cffd7d2150505ef8afc13231bf.tar.bz2
PowerPC: drop some 74xx_7xx boards and related code
The file board/Marvell/include/mv_gen_reg.h is incompatible with the GPL (see for example the "MARVELL RESERVES THE RIGHT AT ITS SOLE DISCRETION TO REQUEST THAT THIS CODE BE IMMEDIATELY RETURNED TO MARVELL" clause). As this cannot be fixed, we remove the file and all code that depends on it. Fortunately this only affects some very old boards that have long reached EOL: CPCI750 DB64360 DB64460 p3m750 p3m7448 Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com> Cc: Stefan Roese <sr@denx.de> Cc: Roger Meier <r.meier@siemens.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/cpu/74xx_7xx/Kconfig16
-rw-r--r--arch/powerpc/cpu/74xx_7xx/start.S13
2 files changed, 1 insertions, 28 deletions
diff --git a/arch/powerpc/cpu/74xx_7xx/Kconfig b/arch/powerpc/cpu/74xx_7xx/Kconfig
index 3378c91..b2f1a59 100644
--- a/arch/powerpc/cpu/74xx_7xx/Kconfig
+++ b/arch/powerpc/cpu/74xx_7xx/Kconfig
@@ -19,30 +19,14 @@ config TARGET_PPMC7XX
config TARGET_ELPPC
bool "Support ELPPC"
-config TARGET_CPCI750
- bool "Support CPCI750"
-
config TARGET_MPC7448HPC2
bool "Support mpc7448hpc2"
-config TARGET_DB64360
- bool "Support DB64360"
-
-config TARGET_DB64460
- bool "Support DB64460"
-
-config TARGET_P3MX
- bool "Support p3mx"
-
endchoice
-source "board/Marvell/db64360/Kconfig"
-source "board/Marvell/db64460/Kconfig"
source "board/eltec/elppc/Kconfig"
-source "board/esd/cpci750/Kconfig"
source "board/evb64260/Kconfig"
source "board/freescale/mpc7448hpc2/Kconfig"
source "board/ppmc7xx/Kconfig"
-source "board/prodrive/p3mx/Kconfig"
endmenu
diff --git a/arch/powerpc/cpu/74xx_7xx/start.S b/arch/powerpc/cpu/74xx_7xx/start.S
index b0e102c..8393781 100644
--- a/arch/powerpc/cpu/74xx_7xx/start.S
+++ b/arch/powerpc/cpu/74xx_7xx/start.S
@@ -28,13 +28,6 @@
#include <asm/mmu.h>
#include <asm/u-boot.h>
-#if !defined(CONFIG_DB64360) && \
- !defined(CONFIG_DB64460) && \
- !defined(CONFIG_CPCI750) && \
- !defined(CONFIG_P3Mx)
-#include <galileo/gt64260R.h>
-#endif
-
/* We don't want the MMU yet.
*/
#undef MSR_KERNEL
@@ -712,11 +705,7 @@ in_ram:
bne 5b
6:
mr r3, r10 /* Destination Address */
-#if defined(CONFIG_DB64360) || \
- defined(CONFIG_DB64460) || \
- defined(CONFIG_CPCI750) || \
- defined(CONFIG_PPMC7XX) || \
- defined(CONFIG_P3Mx)
+#if defined(CONFIG_PPMC7XX)
mr r4, r9 /* Use RAM copy of the global data */
#endif
bl after_reloc