powerpc/mpc85xx: drop socrates specific image creation

convert socrates board to use MPC85XX_HAVE_RESET_VECTOR and
disable CONFIG_OF_BOARD and use common u-boot.dtsi for
creating u-boot-dtb.bin.

Signed-off-by: Heiko Schocher <hs@denx.de>

diff --git a/arch/powerpc/dts/socrates-u-boot.dtsi b/arch/powerpc/dts/socrates-u-boot.dtsi
index f6af611b513c610e5e02f8dfbc4162004868e958..67c12f672cf5fe68ec21f5d4204357e1b41675d1 100644 (file)
--- a/arch/powerpc/dts/socrates-u-boot.dtsi
+++ b/arch/powerpc/dts/socrates-u-boot.dtsi
@@ -3,20 +3,9 @@
  * Copyright (C) 2019
  * Heiko Schocher, DENX Software Engineering, hs@denx.de
  */
-/ {
-       binman {
-               filename = "u-boot-dtb.bin";
-               pad-byte = <0xff>;
-               // Place dtb one sector before u-boot-nodtb.bin
-               blob {
-                       filename = "u-boot.dtb";
-               };
-               u-boot-nodtb {
-                       filename = "u-boot-nodtb.bin";
-                       offset = <0x20000>;
-               };
-       };
+#include <config.h>
 
+/ {
        chosen {
                stdout-path = &serial0;
        };
@@ -38,3 +27,5 @@
        u-boot,dm-pre-reloc;
        clock-frequency = <333333330>;
 };
+
+#include "u-boot.dtsi"

diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 9c4dd186fca7b85862c281390eb34121eb3468b1..1d63c81a9c81fde37e73cf813ac8c4cfb96e0f72 100644 (file)
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -217,23 +217,6 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 }
 #endif /* CONFIG_OF_BOARD_SETUP */
 
-#if defined(CONFIG_OF_SEPARATE)
-void *board_fdt_blob_setup(int *err)
-{
-       void *fw_dtb;
-
-       *err = 0;
-       fw_dtb = (void *)(CONFIG_TEXT_BASE - CONFIG_ENV_SECT_SIZE);
-       if (fdt_magic(fw_dtb) != FDT_MAGIC) {
-               printf("DTB is not passed via %x\n", (u32)fw_dtb);
-               *err = -ENXIO;
-               return NULL;
-       }
-
-       return fw_dtb;
-}
-#endif
-
 int get_serial_clock(void)
 {
        return 333333330;

diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index ade1c79c0354022deb25d2350273fe598eda9966..03e84c3e7e55dff8ffdbfe16b64517d6b25319d1 100644 (file)
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -1,6 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_IMMR=0xE0000000
-CONFIG_TEXT_BASE=0xfff60000
+CONFIG_TEXT_BASE=0xFFF40000
 CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_SECT_SIZE=0x20000
 CONFIG_DEFAULT_DEVICE_TREE="socrates"
@@ -11,13 +11,14 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_SOCRATES=y
+CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MONITOR_LEN=786432
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_MONITOR_BASE=0xFFF60000
+CONFIG_SYS_MONITOR_BASE=0xFFF40000
 CONFIG_BOOTDELAY=1
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="run boot_nor"
@@ -54,7 +55,6 @@ CONFIG_CMD_SNTP=y
 CONFIG_CMD_EXT2=y
 # CONFIG_CMD_IRQ is not set
 CONFIG_OF_CONTROL=y
-CONFIG_OF_BOARD=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_ADDR_REDUND=0xFFF00000