diff options
| author | Tom Rini <trini@konsulko.com> | 2023-03-01 09:39:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-03-01 09:39:18 -0500 |
| commit | b0eda49bc9b00503366f2ec431be0178caf9e9b5 (patch) | |
| tree | 716b539a86b6d0044a6a0f2ec6b065384c96fc47 | |
| parent | daaca13b52aa6a95480c5220712f26e3278a2f85 (diff) | |
| parent | 1415cdac77d66b3d6ed4b4367e31c61dae41aebe (diff) | |
| download | u-boot-b0eda49bc9b00503366f2ec431be0178caf9e9b5.zip u-boot-b0eda49bc9b00503366f2ec431be0178caf9e9b5.tar.gz u-boot-b0eda49bc9b00503366f2ec431be0178caf9e9b5.tar.bz2 | |
Merge tag 'u-boot-at91-fixes-2023.04-a' of https://source.denx.de/u-boot/custodians/u-boot-at91
First set of u-boot-at91 fixes for the 2023.04 cycle:
This fixes set include one clock index fix for sama7g5 and two board
configuration alignments for pm9g45.
| -rw-r--r-- | arch/arm/dts/sama7g5.dtsi | 2 | ||||
| -rw-r--r-- | configs/pm9g45_defconfig | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/dts/sama7g5.dtsi b/arch/arm/dts/sama7g5.dtsi index 6388a60..746a5ba 100644 --- a/arch/arm/dts/sama7g5.dtsi +++ b/arch/arm/dts/sama7g5.dtsi @@ -151,7 +151,7 @@ 0x1 0x0 0x48000000 0x8000000 0x2 0x0 0x50000000 0x8000000 0x3 0x0 0x58000000 0x8000000>; - clocks = <&pmc PMC_TYPE_CORE 13>; /* PMC_MCK1 */ + clocks = <&pmc PMC_TYPE_CORE 23>; /* PMC_MCK1 */ status = "disabled"; nand_controller: nand-controller { diff --git a/configs/pm9g45_defconfig b/configs/pm9g45_defconfig index e7b4d96..0afdd0a 100644 --- a/configs/pm9g45_defconfig +++ b/configs/pm9g45_defconfig @@ -14,15 +14,15 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xffffee00 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_ENV_OFFSET_REDUND=0x100000 -CONFIG_SYS_LOAD_ADDR=0x22000000 +CONFIG_SYS_LOAD_ADDR=0x70000000 CONFIG_DEBUG_UART=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_NAND_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="fbcon=rotate:3 console=tty0 console=ttyS0,115200 root=/dev/mtdblock4 mtdparts=atmel_nand:128k(bootstrap)ro,256k(uboot)ro,1664k(env),2M(linux)ro,-(root) rw rootfstype=jffs2" +CONFIG_BOOTARGS="console=ttyS0,115200 mtdparts=atmel_nand:128k(bootstrap)ro,640k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),8M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2" CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="nand read 0x70000000 0x200000 0x300000;bootm 0x70000000" +CONFIG_BOOTCOMMAND="nand read 0x70000000 0x180000 0x880000; nand read 0x70080000 0x200000 0x800000; bootz 0x70080000 - 0x70000000" CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_RESET_PHY_R=y @@ -53,7 +53,6 @@ CONFIG_CLK_AT91=y CONFIG_AT91_GPIO=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD=y -CONFIG_SYS_NAND_DRIVER_ECC_LAYOUT=y # CONFIG_SYS_NAND_USE_FLASH_BBT is not set CONFIG_NAND_ATMEL=y CONFIG_MACB=y |