Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b8b3c86 authored by Max Filippov's avatar Max Filippov
Browse files

xtensa: add default memmap and mmio32native options to defconfigs 



Now that memory initialization doesn't add default memory region
specify it explicitly in the memmap command line option in case somebody
wants to boot in non-DT-enabled configuration.

While at it update earlycon access mode to mmio32native to support both
LE and BE cores transparently.

Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent 6edbbd16

arch/xtensa/configs/audio_kc705_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ CONFIG_HIGHMEM=y 
# CONFIG_PCI is not set

CONFIG_XTENSA_PLATFORM_XTFPGA=y

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="earlycon=uart8250,mmio32,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug"

CONFIG_CMDLINE="earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x38000000@0"

CONFIG_USE_OF=y

CONFIG_BUILTIN_DTB="kc705"

# CONFIG_COMPACTION is not set

arch/xtensa/configs/generic_kc705_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ CONFIG_HIGHMEM=y 
# CONFIG_PCI is not set

CONFIG_XTENSA_PLATFORM_XTFPGA=y

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="earlycon=uart8250,mmio32,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug"

CONFIG_CMDLINE="earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x38000000@0"

CONFIG_USE_OF=y

CONFIG_BUILTIN_DTB="kc705"

# CONFIG_COMPACTION is not set

arch/xtensa/configs/nommu_kc705_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ CONFIG_PREEMPT=y 
# CONFIG_PCI is not set

CONFIG_XTENSA_PLATFORM_XTFPGA=y

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="earlycon=uart8250,mmio32,0x9d050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug"

CONFIG_CMDLINE="earlycon=uart8250,mmio32native,0x9d050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=256M@0x60000000"

CONFIG_USE_OF=y

CONFIG_BUILTIN_DTB="kc705_nommu"

CONFIG_DEFAULT_MEM_SIZE=0x10000000

arch/xtensa/configs/smp_lx200_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ CONFIG_HOTPLUG_CPU=y 
# CONFIG_PCI is not set

CONFIG_XTENSA_PLATFORM_XTFPGA=y

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="earlycon=uart8250,mmio32,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug"

CONFIG_CMDLINE="earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=96M@0"

CONFIG_USE_OF=y

CONFIG_BUILTIN_DTB="lx200mx"

# CONFIG_COMPACTION is not set