Skip to contentSkip to conversation

configs: Minor fixes

PATCH New Alexander Dahl 3 participants 5 messages Feb 6, 2019 – Feb 8, 2019

lore
Share & tools
lore
#0 lore raw

cover configs: Minor fixes

Hei hei,

two small patches. One is some missing piece in a defconfig for Microchip SAMA5D27-SOM1-EK1 board. The other one is something I stumbled over by accident.

Greets
Alex

Alexander Dahl (2):
configs: Remove version control leftovers
configs: sama5d27_som1_ek: Activate misc init for uSD variant

 configs/kylin-rk3036_defconfig.rej      | 10 ----------
 configs/puma-rk3399_defconfig.rej       | 10 ----------
 configs/sama5d27_som1_ek_mmc1_defconfig |  1 +
 3 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 configs/kylin-rk3036_defconfig.rej
 delete mode 100644 configs/puma-rk3399_defconfig.rej
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/2 configs: Remove version control leftovers

I assume those should not have been committed in the first place?

Fixes 2ec3d25f8faab51c2334174a582a96ad28d96344
---
 configs/kylin-rk3036_defconfig.rej | 10 ----------
 configs/puma-rk3399_defconfig.rej  | 10 ----------
 2 files changed, 20 deletions(-)
 delete mode 100644 configs/kylin-rk3036_defconfig.rej
 delete mode 100644 configs/puma-rk3399_defconfig.rej
configs/kylin-rk3036_defconfig.rej deleted +0 -10
deleted file mode 100644
index 5478e65f1a..0000000000
@@ -1,10 +0,0 @@
---- configs/kylin-rk3036_defconfig
-+++ configs/kylin-rk3036_defconfig
-@@ -8,6 +8,7 @@ CONFIG_ROCKCHIP_RK3036=y
- CONFIG_TARGET_KYLIN_RK3036=y
- CONFIG_SPL_STACK_R_ADDR=0x80000
- CONFIG_DEFAULT_DEVICE_TREE="rk3036-sdk"
-+CONFIG_DEBUG_UART=y
- CONFIG_SPL_SYS_MALLOC_F_LEN=0x0
- # CONFIG_ANDROID_BOOT_IMAGE is not set
- # CONFIG_DISPLAY_CPUINFO is not set
configs/puma-rk3399_defconfig.rej deleted +0 -10
deleted file mode 100644
index 78a1819b5f..0000000000
@@ -1,10 +0,0 @@
---- configs/puma-rk3399_defconfig
-+++ configs/puma-rk3399_defconfig
-@@ -74,7 +74,6 @@ CONFIG_ETH_DESIGNWARE=y
- CONFIG_GMAC_ROCKCHIP=y
- CONFIG_PINCTRL=y
- CONFIG_SPL_PINCTRL=y
--CONFIG_PINCTRL_ROCKCHIP_RK3399=y
- CONFIG_DM_PMIC=y
- CONFIG_DM_PMIC_FAN53555=y
- CONFIG_PMIC_RK8XX=y
Signature · 1 line
2.11.0
#2 lore raw

PATCH 1/2 configs: Remove version control leftovers

Alexander,

there’s a PR for this open already:

	https://patchwork.ozlabs.org/patch/1036561/

Sorry for the inconvenience.
Philipp.

Quoted 52 lines · Alexander Dahl

I assume those should not have been committed in the first place?

Fixes 2ec3d25f8faab51c2334174a582a96ad28d96344

---
configs/kylin-rk3036_defconfig.rej | 10 ---------- configs/puma-rk3399_defconfig.rej | 10 ----------

2 files changed, 20 deletions(-)

delete mode 100644 configs/kylin-rk3036_defconfig.rej delete mode 100644 configs/puma-rk3399_defconfig.rej

configs/kylin-rk3036_defconfig.rej deleted +0 -10
deleted file mode 100644
index 5478e65f1a..0000000000
@@ -1,10 +0,0 @@
---- configs/kylin-rk3036_defconfig
-+++ configs/kylin-rk3036_defconfig
-@@ -8,6 +8,7 @@ CONFIG_ROCKCHIP_RK3036=y
- CONFIG_TARGET_KYLIN_RK3036=y
- CONFIG_SPL_STACK_R_ADDR=0x80000
- CONFIG_DEFAULT_DEVICE_TREE="rk3036-sdk"
-+CONFIG_DEBUG_UART=y
- CONFIG_SPL_SYS_MALLOC_F_LEN=0x0
- # CONFIG_ANDROID_BOOT_IMAGE is not set
- # CONFIG_DISPLAY_CPUINFO is not set
configs/puma-rk3399_defconfig.rej deleted +0 -10
deleted file mode 100644
index 78a1819b5f..0000000000
@@ -1,10 +0,0 @@
---- configs/puma-rk3399_defconfig
-+++ configs/puma-rk3399_defconfig
-@@ -74,7 +74,6 @@ CONFIG_ETH_DESIGNWARE=y
- CONFIG_GMAC_ROCKCHIP=y
- CONFIG_PINCTRL=y
- CONFIG_SPL_PINCTRL=y
--CONFIG_PINCTRL_ROCKCHIP_RK3399=y
- CONFIG_DM_PMIC=y
- CONFIG_DM_PMIC_FAN53555=y
- CONFIG_PMIC_RK8XX=y
Signature · 6 lines
2.11.0

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
#3 lore raw

PATCH 2/2 configs: sama5d27_som1_ek: Activate misc init for uSD variant

In reply to Alexander Dahl

This was already set for 'sama5d27_som1_ek_mmc_defconfig' (first SD card, full size). Without this option set, the MAC address is not read from the I²C EEPROM at boot, and remains unset:

U-Boot 2019.01 (Jan 01 2019 - 00:00:00 +0000)

CPU: SAMA5D27 1G bits DDR2 SDRAM
Crystal frequency: 24 MHz
CPU clock : 492 MHz
Master clock : 164 MHz
DRAM: 128 MiB
MMC: sdio-host at a0000000: 0, sdio-host at b0000000: 1
Loading Environment from FAT... OK
In: serial
Out: serial
Err: serial
Net:
Error: ethernet at f8008000 address not set.
eth-1: ethernet at f8008000
Hit any key to stop autoboot: 0

---
 configs/sama5d27_som1_ek_mmc1_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/sama5d27_som1_ek_mmc1_defconfig +1 -0
index 5f4abe8605..9ba8d79e31 100644
@@ -23,6 +23,7 @@ CONFIG_SD_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait"
+CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_HUSH_PARSER=y
Signature · 1 line
2.11.0
#4 lore raw

PATCH 2/2 configs: sama5d27_som1_ek: Activate misc init for uSD variant

Quoted 21 lines · Alexander Dahl

This was already set for 'sama5d27_som1_ek_mmc_defconfig' (first SD card, full size). Without this option set, the MAC address is not read from the I²C EEPROM at boot, and remains unset:

U-Boot 2019.01 (Jan 01 2019 - 00:00:00 +0000)

CPU: SAMA5D27 1G bits DDR2 SDRAM
Crystal frequency: 24 MHz
CPU clock : 492 MHz
Master clock : 164 MHz
DRAM: 128 MiB
MMC: sdio-host at a0000000: 0, sdio-host at b0000000: 1
Loading Environment from FAT... OK
In: serial
Out: serial
Err: serial
Net:
Error: ethernet at f8008000 address not set.
eth-1: ethernet at f8008000
Hit any key to stop autoboot: 0

Quoted 1 line

Applied to u-boot-atmel/master
Thanks !