aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/dts/socrates-u-boot.dtsi23
-rw-r--r--arch/powerpc/dts/socrates.dts59
-rw-r--r--arch/powerpc/dts/u-boot.dtsi2
-rw-r--r--arch/powerpc/lib/Makefile1
-rw-r--r--arch/powerpc/lib/bat_rw.c244
-rw-r--r--arch/powerpc/lib/bootm.c2
6 files changed, 46 insertions, 285 deletions
diff --git a/arch/powerpc/dts/socrates-u-boot.dtsi b/arch/powerpc/dts/socrates-u-boot.dtsi
index 14a7c245dc..88df031732 100644
--- a/arch/powerpc/dts/socrates-u-boot.dtsi
+++ b/arch/powerpc/dts/socrates-u-boot.dtsi
@@ -3,18 +3,11 @@
* Copyright (C) 2019
* Heiko Schocher, DENX Software Engineering, hs@denx.de
*/
+#include <config.h>
+
/ {
- binman {
- filename = "u-boot-socrates.bin";
- pad-byte = <0xff>;
- // Place dtb one sector before u-boot-nodtb.bin
- blob {
- filename = "dts/dt.dtb";
- };
- u-boot-nodtb {
- filename = "u-boot-nodtb.bin";
- offset = <0x20000>;
- };
+ aliases {
+ eeprom0 = &i2c_eeprom0;
};
chosen {
@@ -24,6 +17,12 @@
soc8544@e0000000 {
i2c@3000 {
u-boot,dm-pre-reloc;
+
+ i2c_eeprom0: eeprom@51{
+ compatible = "atmel,24c64";
+ reg = <0x51>;
+ pagesize = <32>;
+ };
};
};
};
@@ -38,3 +37,5 @@
u-boot,dm-pre-reloc;
clock-frequency = <333333330>;
};
+
+#include "u-boot.dtsi"
diff --git a/arch/powerpc/dts/socrates.dts b/arch/powerpc/dts/socrates.dts
index 452cf58b5e..ea75eb6af3 100644
--- a/arch/powerpc/dts/socrates.dts
+++ b/arch/powerpc/dts/socrates.dts
@@ -9,6 +9,8 @@
/dts-v1/;
+/include/ "e500v2_power_isa.dtsi"
+
/ {
model = "abb,socrates";
compatible = "abb,socrates";
@@ -142,26 +144,29 @@
phy-handle = <&phy0>;
tbi-handle = <&tbi0>;
phy-connection-type = "rgmii-id";
+ };
- mdio@520 {
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "fsl,gianfar-mdio";
- reg = <0x520 0x20>;
-
- phy0: ethernet-phy@0 {
- interrupt-parent = <&mpic>;
- interrupts = <0 1>;
- reg = <0>;
- };
- phy1: ethernet-phy@1 {
- interrupt-parent = <&mpic>;
- interrupts = <0 1>;
- reg = <1>;
- };
- tbi0: tbi-phy@11 {
- reg = <0x11>;
- };
+ mdio@24520 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "fsl,gianfar-mdio";
+ reg = <0x24520 0x20>;
+
+ phy0: ethernet-phy@0 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ interrupt-parent = <&mpic>;
+ interrupts = <0 1>;
+ reg = <0>;
+ };
+
+ phy1: ethernet-phy@1 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ interrupt-parent = <&mpic>;
+ interrupts = <0 1>;
+ reg = <1>;
+ };
+ tbi0: tbi-phy@11 {
+ reg = <0x11>;
};
};
@@ -180,16 +185,16 @@
phy-handle = <&phy1>;
tbi-handle = <&tbi1>;
phy-connection-type = "rgmii-id";
+ };
- mdio@520 {
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "fsl,gianfar-tbi";
- reg = <0x520 0x20>;
+ mdio@26520 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "fsl,gianfar-tbi";
+ reg = <0x26520 0x20>;
- tbi1: tbi-phy@11 {
- reg = <0x11>;
- };
+ tbi1: tbi-phy@11 {
+ reg = <0x11>;
};
};
diff --git a/arch/powerpc/dts/u-boot.dtsi b/arch/powerpc/dts/u-boot.dtsi
index 6b7375cff2..c39ab6f0ca 100644
--- a/arch/powerpc/dts/u-boot.dtsi
+++ b/arch/powerpc/dts/u-boot.dtsi
@@ -9,7 +9,7 @@
/ {
binman {
- filename = "u-boot.bin";
+ filename = "u-boot-dtb.bin";
skip-at-start = <CONFIG_TEXT_BASE>;
sort-by-offset;
pad-byte = <0xff>;
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 066d7f408e..bb819dcbb6 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -34,7 +34,6 @@ obj-y += ticks.o
endif
obj-y += reloc.o
-obj-$(CONFIG_BAT_RW) += bat_rw.o
obj-$(CONFIG_CMD_BOOTM) += bootm.o
obj-y += cache.o
obj-y += extable.o
diff --git a/arch/powerpc/lib/bat_rw.c b/arch/powerpc/lib/bat_rw.c
deleted file mode 100644
index 24dd30615b..0000000000
--- a/arch/powerpc/lib/bat_rw.c
+++ /dev/null
@@ -1,244 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2002
- * Rich Ireland, Enterasys Networks, rireland@enterasys.com.
- */
-
-#include <common.h>
-#include <asm/global_data.h>
-#include <asm/processor.h>
-#include <asm/mmu.h>
-#include <asm/io.h>
-#include <linux/compiler.h>
-
-#ifdef CONFIG_ADDR_MAP
-#include <addr_map.h>
-#endif
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int write_bat (ppc_bat_t bat, unsigned long upper, unsigned long lower)
-{
- __maybe_unused int batn = -1;
-
- sync();
-
- switch (bat) {
- case DBAT0:
- mtspr (DBAT0L, lower);
- mtspr (DBAT0U, upper);
- batn = 0;
- break;
- case IBAT0:
- mtspr (IBAT0L, lower);
- mtspr (IBAT0U, upper);
- break;
- case DBAT1:
- mtspr (DBAT1L, lower);
- mtspr (DBAT1U, upper);
- batn = 1;
- break;
- case IBAT1:
- mtspr (IBAT1L, lower);
- mtspr (IBAT1U, upper);
- break;
- case DBAT2:
- mtspr (DBAT2L, lower);
- mtspr (DBAT2U, upper);
- batn = 2;
- break;
- case IBAT2:
- mtspr (IBAT2L, lower);
- mtspr (IBAT2U, upper);
- break;
- case DBAT3:
- mtspr (DBAT3L, lower);
- mtspr (DBAT3U, upper);
- batn = 3;
- break;
- case IBAT3:
- mtspr (IBAT3L, lower);
- mtspr (IBAT3U, upper);
- break;
-#ifdef CONFIG_HIGH_BATS
- case DBAT4:
- mtspr (DBAT4L, lower);
- mtspr (DBAT4U, upper);
- batn = 4;
- break;
- case IBAT4:
- mtspr (IBAT4L, lower);
- mtspr (IBAT4U, upper);
- break;
- case DBAT5:
- mtspr (DBAT5L, lower);
- mtspr (DBAT5U, upper);
- batn = 5;
- break;
- case IBAT5:
- mtspr (IBAT5L, lower);
- mtspr (IBAT5U, upper);
- break;
- case DBAT6:
- mtspr (DBAT6L, lower);
- mtspr (DBAT6U, upper);
- batn = 6;
- break;
- case IBAT6:
- mtspr (IBAT6L, lower);
- mtspr (IBAT6U, upper);
- break;
- case DBAT7:
- mtspr (DBAT7L, lower);
- mtspr (DBAT7U, upper);
- batn = 7;
- break;
- case IBAT7:
- mtspr (IBAT7L, lower);
- mtspr (IBAT7U, upper);
- break;
-#endif
- default:
- return (-1);
- }
-
-#ifdef CONFIG_ADDR_MAP
- if ((gd->flags & GD_FLG_RELOC) && (batn >= 0)) {
- phys_size_t size;
- if (!BATU_VALID(upper))
- size = 0;
- else
- size = BATU_SIZE(upper);
- addrmap_set_entry(BATU_VADDR(upper), BATL_PADDR(lower),
- size, batn);
- }
-#endif
-
- sync();
- isync();
-
- return (0);
-}
-
-int read_bat (ppc_bat_t bat, unsigned long *upper, unsigned long *lower)
-{
- unsigned long register u;
- unsigned long register l;
-
- switch (bat) {
- case DBAT0:
- l = mfspr (DBAT0L);
- u = mfspr (DBAT0U);
- break;
- case IBAT0:
- l = mfspr (IBAT0L);
- u = mfspr (IBAT0U);
- break;
- case DBAT1:
- l = mfspr (DBAT1L);
- u = mfspr (DBAT1U);
- break;
- case IBAT1:
- l = mfspr (IBAT1L);
- u = mfspr (IBAT1U);
- break;
- case DBAT2:
- l = mfspr (DBAT2L);
- u = mfspr (DBAT2U);
- break;
- case IBAT2:
- l = mfspr (IBAT2L);
- u = mfspr (IBAT2U);
- break;
- case DBAT3:
- l = mfspr (DBAT3L);
- u = mfspr (DBAT3U);
- break;
- case IBAT3:
- l = mfspr (IBAT3L);
- u = mfspr (IBAT3U);
- break;
-#ifdef CONFIG_HIGH_BATS
- case DBAT4:
- l = mfspr (DBAT4L);
- u = mfspr (DBAT4U);
- break;
- case IBAT4:
- l = mfspr (IBAT4L);
- u = mfspr (IBAT4U);
- break;
- case DBAT5:
- l = mfspr (DBAT5L);
- u = mfspr (DBAT5U);
- break;
- case IBAT5:
- l = mfspr (IBAT5L);
- u = mfspr (IBAT5U);
- break;
- case DBAT6:
- l = mfspr (DBAT6L);
- u = mfspr (DBAT6U);
- break;
- case IBAT6:
- l = mfspr (IBAT6L);
- u = mfspr (IBAT6U);
- break;
- case DBAT7:
- l = mfspr (DBAT7L);
- u = mfspr (DBAT7U);
- break;
- case IBAT7:
- l = mfspr (IBAT7L);
- u = mfspr (IBAT7U);
- break;
-#endif
- default:
- return (-1);
- }
-
- *upper = u;
- *lower = l;
-
- return (0);
-}
-
-void print_bats(void)
-{
- printf("BAT registers:\n");
-
- printf ("\tIBAT0L = 0x%08X ", mfspr (IBAT0L));
- printf ("\tIBAT0U = 0x%08X\n", mfspr (IBAT0U));
- printf ("\tDBAT0L = 0x%08X ", mfspr (DBAT0L));
- printf ("\tDBAT0U = 0x%08X\n", mfspr (DBAT0U));
- printf ("\tIBAT1L = 0x%08X ", mfspr (IBAT1L));
- printf ("\tIBAT1U = 0x%08X\n", mfspr (IBAT1U));
- printf ("\tDBAT1L = 0x%08X ", mfspr (DBAT1L));
- printf ("\tDBAT1U = 0x%08X\n", mfspr (DBAT1U));
- printf ("\tIBAT2L = 0x%08X ", mfspr (IBAT2L));
- printf ("\tIBAT2U = 0x%08X\n", mfspr (IBAT2U));
- printf ("\tDBAT2L = 0x%08X ", mfspr (DBAT2L));
- printf ("\tDBAT2U = 0x%08X\n", mfspr (DBAT2U));
- printf ("\tIBAT3L = 0x%08X ", mfspr (IBAT3L));
- printf ("\tIBAT3U = 0x%08X\n", mfspr (IBAT3U));
- printf ("\tDBAT3L = 0x%08X ", mfspr (DBAT3L));
- printf ("\tDBAT3U = 0x%08X\n", mfspr (DBAT3U));
-
-#ifdef CONFIG_HIGH_BATS
- printf ("\tIBAT4L = 0x%08X ", mfspr (IBAT4L));
- printf ("\tIBAT4U = 0x%08X\n", mfspr (IBAT4U));
- printf ("\tDBAT4L = 0x%08X ", mfspr (DBAT4L));
- printf ("\tDBAT4U = 0x%08X\n", mfspr (DBAT4U));
- printf ("\tIBAT5L = 0x%08X ", mfspr (IBAT5L));
- printf ("\tIBAT5U = 0x%08X\n", mfspr (IBAT5U));
- printf ("\tDBAT5L = 0x%08X ", mfspr (DBAT5L));
- printf ("\tDBAT5U = 0x%08X\n", mfspr (DBAT5U));
- printf ("\tIBAT6L = 0x%08X ", mfspr (IBAT6L));
- printf ("\tIBAT6U = 0x%08X\n", mfspr (IBAT6U));
- printf ("\tDBAT6L = 0x%08X ", mfspr (DBAT6L));
- printf ("\tDBAT6U = 0x%08X\n", mfspr (DBAT6U));
- printf ("\tIBAT7L = 0x%08X ", mfspr (IBAT7L));
- printf ("\tIBAT7U = 0x%08X\n", mfspr (IBAT7U));
- printf ("\tDBAT7L = 0x%08X ", mfspr (DBAT7L));
- printf ("\tDBAT7U = 0x%08X\n", mfspr (DBAT7U));
-#endif
-}
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index 7b392b06bc..910121ec9c 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -214,7 +214,7 @@ static int boot_body_linux(struct bootm_headers *images)
if (ret)
return ret;
- if (CONFIG_IS_ENABLED(LMB)) {
+ if (IS_ENABLED(CONFIG_LMB)) {
ret = image_setup_linux(images);
if (ret)
return ret;
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-31 21:32:14 +0000