diff options
| author | Tom Rini | 2023-03-22 14:01:01 -0400 |
|---|---|---|
| committer | Tom Rini | 2023-03-22 14:01:01 -0400 |
| commit | c84a00a647057d83ecfb081ca03c4865e4c1c1be (patch) | |
| tree | c06d3e7309022a299855ac566ba51f3fb38b0007 /arch | |
| parent | 5e207b8517427226b96c5e808ae119fb1d75d39a (diff) | |
| parent | f8461352b84ea66ad03d3231a5056643ab73515d (diff) | |
Merge branch '2023-03-22-assorted-fixes'
- Assorted TI platform fixes, correct location of NXP boot format git
repository, don't try and mount partitions that are too small to be
ext4 as ext4, handle .bin files in .gitattributes, flush out panic
messages for sure, and correct console location on Arm total_compute.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/lib/reset.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-k3/include/mach/am62_hardware.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c index 95169bae1c1..3e051e36f12 100644 --- a/arch/arm/lib/reset.c +++ b/arch/arm/lib/reset.c @@ -25,6 +25,7 @@ #include <cpu_func.h> #include <irq_func.h> #include <linux/delay.h> +#include <stdio.h> __weak void reset_misc(void) { @@ -33,8 +34,7 @@ __weak void reset_misc(void) int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { puts ("resetting ...\n"); - - mdelay(50); /* wait 50 ms */ + flush(); disable_interrupts(); diff --git a/arch/arm/mach-k3/include/mach/am62_hardware.h b/arch/arm/mach-k3/include/mach/am62_hardware.h index 17d3228cbac..db4a32cd461 100644 --- a/arch/arm/mach-k3/include/mach/am62_hardware.h +++ b/arch/arm/mach-k3/include/mach/am62_hardware.h @@ -55,7 +55,6 @@ #define ROM_EXTENDED_BOOT_DATA_INFO 0x43c3f1e0 -/* Use Last 2K as Scratch pad */ -#define TI_SRAM_SCRATCH_BOARD_EEPROM_START 0x70000000 +#define TI_SRAM_SCRATCH_BOARD_EEPROM_START 0x43c30000 #endif /* __ASM_ARCH_AM62_HARDWARE_H */ |