diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-31 17:52:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-08-31 17:55:32 -0400 |
| commit | df6cf3d809fe543651e6bdf133baaa8b9841fe0f (patch) | |
| tree | a884597e97578cb074adc33d3dd961d6675c9879 /arch/arm/mach-omap2/omap3/lowlevel_init.S | |
| parent | a85a8e63c5cf8ccb3905eb5982bf8bdcb2978557 (diff) | |
| parent | b4c2c151b14b59a2403675526adf666710cade67 (diff) | |
Merge branch '2021-08-31-kconfig-migrations-part2' into next
- Further CONFIG to Kconfig migrations
- Some DDR related symbols
- CONFIG_SYS_LOAD_ADDR moved, loadaddr always set in environment now.
- Finish MX7D, convert IMX_CONFIG
- Some RAMBOOT related options
- L1 cache size converted and named consistently for all arches. A
further follow-up to rename things for even better clarity is welcome.
- CONFIG_SKIP_LOWLEVEL_INIT, CONFIG_SYS_MALLOC_LEN
Diffstat (limited to 'arch/arm/mach-omap2/omap3/lowlevel_init.S')
| -rw-r--r-- | arch/arm/mach-omap2/omap3/lowlevel_init.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap3/lowlevel_init.S b/arch/arm/mach-omap2/omap3/lowlevel_init.S index 4fa89418a11..ab7cdcf3d42 100644 --- a/arch/arm/mach-omap2/omap3/lowlevel_init.S +++ b/arch/arm/mach-omap2/omap3/lowlevel_init.S @@ -170,8 +170,8 @@ pll_div_val5: go_to_speed_end: #endif -#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && \ - !defined(CONFIG_SKIP_LOWLEVEL_INIT_ONLY) +#if !CONFIG_IS_ENABLED(SKIP_LOWLEVEL_INIT) && \ + !CONFIG_IS_ENABLED(SKIP_LOWLEVEL_INIT_ONLY) ENTRY(lowlevel_init) ldr sp, SRAM_STACK str ip, [sp] /* stash ip register */ |