michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc: nxp: Add define needed by the SDK USB driver

Browse source 
1. Add USB_STACK_USE_DEDICATED_RAM=1 define that is
   used by the SDK USB driver
2. Delete unused "config USB_DEDICATED_MEMORY"

Signed-off-by: Mahesh Mahadevan <mahesh.mahadevan@nxp.com>
This commit is contained in:
Mahesh Mahadevan 2022-08-22 15:19:51 -05:00
commit 9619b02f9b
6 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soc/arm/nxp_imx/rt5xx/CMakeLists.txt
View file

@ -6,6 +6,8 @@
zephyr_compile_definitions(FSL_SDK_DRIVER_QUICK_ACCESS_ENABLE) zephyr_compile_definitions(FSL_SDK_DRIVER_QUICK_ACCESS_ENABLE)
zephyr_compile_definitions_ifdef(CONFIG_USB_DEVICE_DRIVER USB_STACK_USE_DEDICATED_RAM=1)
zephyr_sources( zephyr_sources(
soc.c soc.c
flash_clock_setup.c flash_clock_setup.c

4
soc/arm/nxp_imx/rt5xx/Kconfig.soc
View file

@ -30,7 +30,6 @@ config SOC_MIMXRT595S_CM33
select HAS_MCUX_USDHC1 select HAS_MCUX_USDHC1
select HAS_MCUX_USDHC2 select HAS_MCUX_USDHC2
select HAS_MCUX_USB_LPCIP3511 select HAS_MCUX_USB_LPCIP3511
select USB_DEDICATED_MEMORY if USB_DEVICE_DRIVER
select HAS_MCUX_CTIMER select HAS_MCUX_CTIMER
endchoice endchoice
@ -68,9 +67,6 @@ config SOC_PART_NUMBER_IMX_RT5XX
option that you should not set directly. The part number selection option that you should not set directly. The part number selection
choice defines the default value for this string. choice defines the default value for this string.
config USB_DEDICATED_MEMORY
bool "Dedicated memory for USB transfer buffer and controller operation buffers"
menuconfig NXP_IMX_RT5XX_BOOT_HEADER menuconfig NXP_IMX_RT5XX_BOOT_HEADER
bool "The boot header" bool "The boot header"
depends on !BOOTLOADER_MCUBOOT depends on !BOOTLOADER_MCUBOOT

2
soc/arm/nxp_imx/rt6xx/CMakeLists.txt
View file

@ -17,6 +17,8 @@ zephyr_library_include_directories(
${ZEPHYR_BASE}/arch/${ARCH}/include ${ZEPHYR_BASE}/arch/${ARCH}/include
) )
zephyr_compile_definitions_ifdef(CONFIG_USB_DEVICE_DRIVER USB_STACK_USE_DEDICATED_RAM=1)
zephyr_linker_sources_ifdef(CONFIG_NXP_IMX_RT6XX_BOOT_HEADER zephyr_linker_sources_ifdef(CONFIG_NXP_IMX_RT6XX_BOOT_HEADER
ROM_START SORT_KEY 0 boot_header.ld) ROM_START SORT_KEY 0 boot_header.ld)

4
soc/arm/nxp_imx/rt6xx/Kconfig.soc
View file

@ -30,7 +30,6 @@ config SOC_MIMXRT685S_CM33
select HAS_MCUX_USDHC2 select HAS_MCUX_USDHC2
select INIT_SYS_PLL select INIT_SYS_PLL
select HAS_MCUX_USB_LPCIP3511 select HAS_MCUX_USB_LPCIP3511
select USB_DEDICATED_MEMORY if USB_DEVICE_DRIVER
select HAS_MCUX_CTIMER select HAS_MCUX_CTIMER
endchoice endchoice
@ -62,9 +61,6 @@ config INIT_SYS_PLL
config INIT_AUDIO_PLL config INIT_AUDIO_PLL
bool "Initialize Audio PLL" bool "Initialize Audio PLL"
config USB_DEDICATED_MEMORY
bool "Dedicated memory for USB transfer buffer and controller operation buffers"
config XTAL_SYS_CLK_HZ config XTAL_SYS_CLK_HZ
int "External oscillator frequency" int "External oscillator frequency"
help help

2
soc/arm/nxp_lpc/lpc55xxx/CMakeLists.txt
View file

@ -15,6 +15,8 @@ zephyr_library_include_directories(
zephyr_linker_sources_ifdef(CONFIG_USB_DEVICE_DRIVER zephyr_linker_sources_ifdef(CONFIG_USB_DEVICE_DRIVER
SECTIONS usb.ld) SECTIONS usb.ld)
zephyr_compile_definitions_ifdef(CONFIG_USB_DEVICE_DRIVER USB_STACK_USE_DEDICATED_RAM=1)
if (CONFIG_SECOND_CORE_MCUX) if (CONFIG_SECOND_CORE_MCUX)
set(gen_dir ${ZEPHYR_BINARY_DIR}/include/generated/) set(gen_dir ${ZEPHYR_BINARY_DIR}/include/generated/)
string(CONFIGURE ${CONFIG_SECOND_IMAGE_MCUX} second_core_image) string(CONFIGURE ${CONFIG_SECOND_IMAGE_MCUX} second_core_image)

4
soc/arm/nxp_lpc/lpc55xxx/Kconfig.soc
View file

@ -68,7 +68,6 @@ config SOC_LPC55S69_CPU0
select HAS_MCUX_LPADC select HAS_MCUX_LPADC
select HAS_MCUX_LPC_DMA select HAS_MCUX_LPC_DMA
select HAS_MCUX_USB_LPCIP3511 select HAS_MCUX_USB_LPCIP3511
select USB_DEDICATED_MEMORY if USB_DEVICE_DRIVER
select HAS_MCUX_CTIMER select HAS_MCUX_CTIMER
select HAS_MCUX_SCTIMER select HAS_MCUX_SCTIMER
select HAS_MCUX_RNG select HAS_MCUX_RNG
@ -129,9 +128,6 @@ config SECOND_IMAGE_MCUX
This points to the image file for the the binary code that will be This points to the image file for the the binary code that will be
used by the second core. used by the second core.
config USB_DEDICATED_MEMORY
bool "Dedicated memory for USB transfer buffer and controller operation buffers"
# Workaround for not being able to have commas in macro arguments # Workaround for not being able to have commas in macro arguments
DT_CHOSEN_Z_CODE_CPU1_PARTITION := zephyr,code-cpu1-partition DT_CHOSEN_Z_CODE_CPU1_PARTITION := zephyr,code-cpu1-partition