From ebae06a6db13e45cd3eedee328ed9b377d50300e Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 8 Mar 2020 01:30:18 +0800 Subject: [PATCH] boards: fix CONFIG_MM_REGIONS related warning in nightly build fix the following warning: chip/sam_allocateheap.c:120:8: warning: #warning "CONFIG_MM_REGIONS < 3: NFC SRAM not included in HEAP" [-Wcpp] 120 | # warning "CONFIG_MM_REGIONS < 3: NFC SRAM not included in HEAP" | ^~~~~~~ chip/lpc17_40_allocateheap.c:176:6: warning: #warning "CONFIG_MM_REGIONS > 1: This configuration has no available AHB SRAM Bank0/1" [-Wcpp] 176 | # warning "CONFIG_MM_REGIONS > 1: This configuration has no available AHB SRAM Bank0/1" | ^~~~~~~ chip/stm32l4_allocateheap.c:141:4: warning: #warning "CONFIG_MM_REGIONS large enough but I do not know what some of the region(s) are" [-Wcpp] 141 | # warning "CONFIG_MM_REGIONS large enough but I do not know what some of the region(s) are" | ^~~~~~~ Signed-off-by: Xiang Xiao --- boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig | 2 +- .../lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig | 1 - boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig | 2 +- boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig | 2 +- boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig | 2 +- boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig | 2 +- boards/arm/sam34/sam3u-ek/configs/knsh/defconfig | 2 +- boards/arm/sam34/sam3u-ek/configs/nsh/defconfig | 2 +- boards/arm/sam34/sam3u-ek/configs/nx/defconfig | 2 +- boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig | 2 +- boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig | 1 - .../arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig | 1 - .../arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig | 1 - .../stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig | 1 - 14 files changed, 9 insertions(+), 14 deletions(-) diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig index 647191b864..641defb344 100644 --- a/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig @@ -97,7 +97,7 @@ CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y CONFIG_MMCSD_SDIO=y -CONFIG_MM_REGIONS=3 +CONFIG_MM_REGIONS=2 CONFIG_MTD=y CONFIG_MTD_M25P=y CONFIG_NETDB_DNSCLIENT=y diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig index 7729a6035d..049752fc75 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig @@ -33,7 +33,6 @@ CONFIG_LPC17_40_UART0=y CONFIG_LPC17_40_USBHOST=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MM_REGIONS=2 CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSSERVER_NOADDR=y diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig index f0d39506cc..faf44a5d04 100644 --- a/boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig +++ b/boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig @@ -31,7 +31,7 @@ CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y CONFIG_MMCSD_SDIO=y -CONFIG_MM_REGIONS=2 +CONFIG_MM_REGIONS=3 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NX=y diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig index acad40fbe3..d6409cff90 100644 --- a/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig +++ b/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig @@ -39,7 +39,7 @@ CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y CONFIG_MMCSD_SDIO=y -CONFIG_MM_REGIONS=2 +CONFIG_MM_REGIONS=3 CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig index 741c90f2cf..f9b57ebd44 100644 --- a/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig +++ b/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig @@ -34,7 +34,7 @@ CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y CONFIG_MMCSD_SDIO=y -CONFIG_MM_REGIONS=2 +CONFIG_MM_REGIONS=3 CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig index d160413e2c..eedf5691cb 100644 --- a/boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig +++ b/boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig @@ -42,7 +42,7 @@ CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y CONFIG_MMCSD_SDIO=y -CONFIG_MM_REGIONS=2 +CONFIG_MM_REGIONS=3 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y diff --git a/boards/arm/sam34/sam3u-ek/configs/knsh/defconfig b/boards/arm/sam34/sam3u-ek/configs/knsh/defconfig index abece7e48b..94cb237b23 100644 --- a/boards/arm/sam34/sam3u-ek/configs/knsh/defconfig +++ b/boards/arm/sam34/sam3u-ek/configs/knsh/defconfig @@ -27,7 +27,7 @@ CONFIG_FS_FAT=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y -CONFIG_MM_REGIONS=2 +CONFIG_MM_REGIONS=3 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_DISABLE_DD=y diff --git a/boards/arm/sam34/sam3u-ek/configs/nsh/defconfig b/boards/arm/sam34/sam3u-ek/configs/nsh/defconfig index 805fab2c61..4ff7de3ee9 100644 --- a/boards/arm/sam34/sam3u-ek/configs/nsh/defconfig +++ b/boards/arm/sam34/sam3u-ek/configs/nsh/defconfig @@ -24,7 +24,7 @@ CONFIG_BUILTIN=y CONFIG_FS_FAT=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MM_REGIONS=2 +CONFIG_MM_REGIONS=3 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y diff --git a/boards/arm/sam34/sam3u-ek/configs/nx/defconfig b/boards/arm/sam34/sam3u-ek/configs/nx/defconfig index 24354afa29..6c4c2eb44b 100644 --- a/boards/arm/sam34/sam3u-ek/configs/nx/defconfig +++ b/boards/arm/sam34/sam3u-ek/configs/nx/defconfig @@ -40,7 +40,7 @@ CONFIG_LCD_MAXPOWER=31 CONFIG_LCD_PORTRAIT=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MM_REGIONS=2 +CONFIG_MM_REGIONS=3 CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_STREAMS=12 diff --git a/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig b/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig index cebc4926c9..0bedeef845 100644 --- a/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig +++ b/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig @@ -36,7 +36,7 @@ CONFIG_LCD_MAXCONTRAST=1 CONFIG_LCD_MAXPOWER=31 CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MM_REGIONS=2 +CONFIG_MM_REGIONS=3 CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_STREAMS=12 diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig index e9fb11c1ea..13d38fa3f6 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig @@ -26,7 +26,6 @@ CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MM_REGIONS=2 CONFIG_MTD_SMART_SECTOR_SIZE=512 CONFIG_MX25RXX_SECTOR512=y CONFIG_NFILE_DESCRIPTORS=8 diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig index 4cdec3fcad..b5edabc16c 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig @@ -48,7 +48,6 @@ CONFIG_LIBM=y CONFIG_LIB_HOSTNAME="B-L475E-IOT01A" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MM_REGIONS=2 CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NETDEV_LATEINIT=y diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig index 9c14e5aa53..6c0929f36c 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig @@ -37,7 +37,6 @@ CONFIG_LIBM=y CONFIG_LIB_HOSTNAME="B-L475E-IOT01A" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MM_REGIONS=2 CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NETDEV_LATEINIT=y diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig index 386aa41ab1..34941746cf 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig @@ -49,7 +49,6 @@ CONFIG_LIBM=y CONFIG_LIB_HOSTNAME="B-L475E-IOT01A" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MM_REGIONS=2 CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NETDEV_LATEINIT=y