michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts: x86: derive RAM and ROM size from dts instead of Kconfig

Browse source 
patch removes Kconfig defines for RAM and ROM size in x86. Instead
these values are derived from dts.

Signed-off-by: Savinay Dharmappa <savinay.dharmappa@intel.com>
This commit is contained in:
Savinay Dharmappa 2018-05-10 15:52:56 +05:30 • committed by Anas Nashif
commit e524f0b846
17 changed files with 27 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

20
arch/x86/core/Kconfig
View file

@ -48,26 +48,6 @@ config MAX_IRQ_LINES
to program to the PIC the association between vectors and to program to the PIC the association between vectors and
interrupts. interrupts.
config RAM_SIZE
int "Amount of RAM given to the kernel (in kB)"
help
This option specifies the amount of RAM given to the kernel. It must
not exceed the amount available on the target. When running an XIP
kernel, it must be large enough to contain the data, bss and noinit
sections. When not running an XIP kernel, it must be large enough to
contain the full image.
The default value is specified by the board.
config ROM_SIZE
int "Amount of ROM given to the kernel (in kB)" if XIP
help
This option specifies the amount of ROM given to the kernel. It must
not exceed the amount available on the target. It must also be large
enough to contain the full image.
The default value is specified by the board.
config SET_GDT config SET_GDT
bool bool
prompt "Setup GDT as part of boot process" prompt "Setup GDT as part of boot process"

7
arch/x86/soc/atom/Kconfig.defconfig
View file

@ -11,13 +11,6 @@ if SOC_ATOM
config SOC config SOC
default atom default atom
config RAM_SIZE
default 128 if XIP
default 256
config ROM_SIZE
default 72 if XIP
config SYS_CLOCK_HW_CYCLES_PER_SEC config SYS_CLOCK_HW_CYCLES_PER_SEC
default 150000000 if LOAPIC_TIMER default 150000000 if LOAPIC_TIMER
default 25000000 if HPET_TIMER default 25000000 if HPET_TIMER

4
arch/x86/soc/atom/dts.fixup
View file

@ -12,6 +12,10 @@
#define CONFIG_PHYS_LOAD_ADDR CONFIG_FLASH_BASE_ADDRESS #define CONFIG_PHYS_LOAD_ADDR CONFIG_FLASH_BASE_ADDRESS
#define CONFIG_RAM_SIZE CONFIG_SRAM_SIZE
#define CONFIG_ROM_SIZE CONFIG_FLASH_SIZE
#define CONFIG_IOAPIC_BASE_ADDRESS INTEL_IOAPIC_FEC00000_BASE_ADDRESS #define CONFIG_IOAPIC_BASE_ADDRESS INTEL_IOAPIC_FEC00000_BASE_ADDRESS
/* End of SoC Level DTS fixup file */ /* End of SoC Level DTS fixup file */

7
arch/x86/soc/ia32/Kconfig.defconfig
View file

@ -11,13 +11,6 @@ if SOC_IA32
config SOC config SOC
default ia32 default ia32
config RAM_SIZE
default 4096 if XIP
default 8188 if !XIP
config ROM_SIZE
default 4092 if XIP
config SYS_CLOCK_HW_CYCLES_PER_SEC config SYS_CLOCK_HW_CYCLES_PER_SEC
default 150000000 if LOAPIC_TIMER default 150000000 if LOAPIC_TIMER
default 25000000 if HPET_TIMER default 25000000 if HPET_TIMER

5
arch/x86/soc/ia32/dts.fixup
View file

@ -12,6 +12,11 @@
#define CONFIG_PHYS_LOAD_ADDR CONFIG_FLASH_BASE_ADDRESS #define CONFIG_PHYS_LOAD_ADDR CONFIG_FLASH_BASE_ADDRESS
#define CONFIG_RAM_SIZE CONFIG_SRAM_SIZE
#define CONFIG_ROM_SIZE CONFIG_FLASH_SIZE
#define CONFIG_IOAPIC_BASE_ADDRESS INTEL_IOAPIC_FEC00000_BASE_ADDRESS #define CONFIG_IOAPIC_BASE_ADDRESS INTEL_IOAPIC_FEC00000_BASE_ADDRESS
/* End of SoC Level DTS fixup file */ /* End of SoC Level DTS fixup file */

6
arch/x86/soc/intel_quark/quark_d2000/Kconfig.defconfig.series
View file

@ -19,12 +19,6 @@ config TOOLCHAIN_VARIANT
config SYS_CLOCK_HW_CYCLES_PER_SEC config SYS_CLOCK_HW_CYCLES_PER_SEC
default 32000000 default 32000000
config RAM_SIZE
default 8
config ROM_SIZE
default 32
config IDT_NUM_VECTORS config IDT_NUM_VECTORS
default 64 default 64

4
arch/x86/soc/intel_quark/quark_d2000/dts.fixup
View file

@ -10,5 +10,9 @@
#define CONFIG_PHYS_LOAD_ADDR CONFIG_FLASH_BASE_ADDRESS #define CONFIG_PHYS_LOAD_ADDR CONFIG_FLASH_BASE_ADDRESS
#define CONFIG_RAM_SIZE CONFIG_SRAM_SIZE
#define CONFIG_ROM_SIZE CONFIG_FLASH_SIZE
#define CONFIG_I2C_0_NAME INTEL_QMSI_I2C_B0002800_LABEL #define CONFIG_I2C_0_NAME INTEL_QMSI_I2C_B0002800_LABEL
#define CONFIG_I2C_0_BITRATE INTEL_QMSI_I2C_B0002800_CLOCK_FREQUENCY #define CONFIG_I2C_0_BITRATE INTEL_QMSI_I2C_B0002800_CLOCK_FREQUENCY

6
arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series
View file

@ -19,12 +19,6 @@ config TOOLCHAIN_VARIANT
default "iamcu" if X86_IAMCU default "iamcu" if X86_IAMCU
default "" if !X86_IAMCU default "" if !X86_IAMCU
config RAM_SIZE
default 52
config ROM_SIZE
default 144
config SYS_CLOCK_HW_CYCLES_PER_SEC config SYS_CLOCK_HW_CYCLES_PER_SEC
default 32000000 default 32000000

4
arch/x86/soc/intel_quark/quark_se/dts.fixup
View file

@ -12,6 +12,10 @@
#define CONFIG_PHYS_LOAD_ADDR CONFIG_FLASH_BASE_ADDRESS #define CONFIG_PHYS_LOAD_ADDR CONFIG_FLASH_BASE_ADDRESS
#define CONFIG_RAM_SIZE CONFIG_SRAM_SIZE
#define CONFIG_ROM_SIZE CONFIG_FLASH_SIZE
#define CONFIG_IOAPIC_BASE_ADDRESS INTEL_IOAPIC_FEC00000_BASE_ADDRESS #define CONFIG_IOAPIC_BASE_ADDRESS INTEL_IOAPIC_FEC00000_BASE_ADDRESS
#define CONFIG_I2C_0_NAME INTEL_QMSI_I2C_B0002800_LABEL #define CONFIG_I2C_0_NAME INTEL_QMSI_I2C_B0002800_LABEL

6
arch/x86/soc/intel_quark/quark_x1000/Kconfig.defconfig.series
View file

@ -12,12 +12,6 @@ if SOC_SERIES_QUARK_X1000
config SOC_SERIES config SOC_SERIES
default quark_x1000 default quark_x1000
config RAM_SIZE
default 32768
config ROM_SIZE
default 1024 if XIP
config SYS_CLOCK_HW_CYCLES_PER_SEC config SYS_CLOCK_HW_CYCLES_PER_SEC
default 25000000 if HPET_TIMER default 25000000 if HPET_TIMER

4
arch/x86/soc/intel_quark/quark_x1000/dts.fixup
View file

@ -10,6 +10,10 @@
#define CONFIG_PHYS_LOAD_ADDR CONFIG_FLASH_BASE_ADDRESS #define CONFIG_PHYS_LOAD_ADDR CONFIG_FLASH_BASE_ADDRESS
#define CONFIG_RAM_SIZE CONFIG_SRAM_SIZE
#define CONFIG_ROM_SIZE CONFIG_FLASH_SIZE
#define CONFIG_IOAPIC_BASE_ADDRESS INTEL_IOAPIC_FEC00000_BASE_ADDRESS #define CONFIG_IOAPIC_BASE_ADDRESS INTEL_IOAPIC_FEC00000_BASE_ADDRESS
#define CONFIG_I2C_0_IRQ SNPS_DESIGNWARE_I2C_90007000_IRQ_0 #define CONFIG_I2C_0_IRQ SNPS_DESIGNWARE_I2C_90007000_IRQ_0

3
boards/x86/arduino_101/Kconfig.defconfig
View file

@ -10,9 +10,6 @@ config TEXT_SECTION_OFFSET
config SS_RESET_VECTOR config SS_RESET_VECTOR
default 0x40034000 default 0x40034000
config ROM_SIZE
default 144
if FLASH && SPI if FLASH && SPI
config SPI_FLASH_W25QXXDV config SPI_FLASH_W25QXXDV

2
boards/x86/arduino_101/arduino_101.dts
View file

@ -1,7 +1,7 @@
/dts-v1/; /dts-v1/;
#define DT_FLASH_SIZE __SIZE_K(144) #define DT_FLASH_SIZE __SIZE_K(144)
#define DT_SRAM_SIZE __SIZE_K(55) #define DT_SRAM_SIZE __SIZE_K(52)
#include "intel_curie.dtsi" #include "intel_curie.dtsi"

9
boards/x86/minnowboard/minnowboard.dts
View file

@ -1,12 +1,7 @@
/dts-v1/; /dts-v1/;
#define DT_FLASH_SIZE __SIZE_K(72) #define DT_FLASH_SIZE __SIZE_K(8912)
#define DT_SRAM_SIZE __SIZE_K(2097152)
#if XIP
#define DT_SRAM_SIZE __SIZE_K(128)
#else
#define DT_SRAM_SIZE __SIZE_K(256)
#endif
#include <atom.dtsi> #include <atom.dtsi>

2
boards/x86/quark_se_c1000_devboard/quark_se_c1000_devboard.dts
View file

@ -1,7 +1,7 @@
/dts-v1/; /dts-v1/;
#define DT_FLASH_SIZE __SIZE_K(144) #define DT_FLASH_SIZE __SIZE_K(144)
#define DT_SRAM_SIZE __SIZE_K(55) #define DT_SRAM_SIZE __SIZE_K(52)
#include "intel_curie.dtsi" #include "intel_curie.dtsi"

3
boards/x86/tinytile/Kconfig.defconfig
View file

@ -10,9 +10,6 @@ config TEXT_SECTION_OFFSET
config SS_RESET_VECTOR config SS_RESET_VECTOR
default 0x40034000 default 0x40034000
config ROM_SIZE
default 192
if USB if USB
config USB_DW config USB_DW

4
boards/x86/tinytile/tinytile.dts
View file

@ -1,7 +1,7 @@
/dts-v1/; /dts-v1/;
#define DT_FLASH_SIZE __SIZE_K(144) #define DT_FLASH_SIZE __SIZE_K(192)
#define DT_SRAM_SIZE __SIZE_K(55) #define DT_SRAM_SIZE __SIZE_K(52)
#include "intel_curie.dtsi" #include "intel_curie.dtsi"