freebsd · gblach · Aug 2, 2018 · Aug 24, 2018
diff --git a/board/BananaPi-M3/setup.sh b/board/BananaPi-M3/setup.sh
@@ -1,4 +1,4 @@
-KERNCONF=GENERIC
+KERNCONF=GENERIC-NODEBUG
 UBLDR_LOADADDR=0x42000000
 SUNXI_UBOOT="u-boot-sinovoip-bpi-m3"
 SUNXI_UBOOT_BIN="u-boot.img"

diff --git a/board/BananaPi/setup.sh b/board/BananaPi/setup.sh
@@ -1,4 +1,4 @@
-KERNCONF=GENERIC
+KERNCONF=GENERIC-NODEBUG
 UBLDR_LOADADDR=0x42000000
 SUNXI_UBOOT="u-boot-bananapi"
 SUNXI_UBOOT_BIN="u-boot.img"

diff --git a/board/BeagleBone/setup.sh b/board/BeagleBone/setup.sh
@@ -1,4 +1,4 @@
-KERNCONF=GENERIC
+KERNCONF=GENERIC-NODEBUG
 BEAGLEBONE_UBOOT_PORT="u-boot-beaglebone"
 BEAGLEBONE_UBOOT_BIN="u-boot.img"
 BEAGLEBONE_UBOOT_PATH="/usr/local/share/u-boot/${BEAGLEBONE_UBOOT_PORT}"

diff --git a/board/BeagleBonePlusRaspberryPi/setup.sh b/board/BeagleBonePlusRaspberryPi/setup.sh
@@ -15,7 +15,7 @@
 board_setup BeagleBone
 board_setup RaspberryPi
 
-KERNCONF=GENERIC
+KERNCONF=GENERIC-NODEBUG
 
 board_partition_image ( ) {
     disk_partition_mbr

diff --git a/board/Cubieboard2/setup.sh b/board/Cubieboard2/setup.sh
@@ -1,4 +1,4 @@
-KERNCONF=GENERIC
+KERNCONF=GENERIC-NODEBUG
 UBLDR_LOADADDR=0x42000000
 SUNXI_UBOOT="u-boot-cubieboard2"
 SUNXI_UBOOT_BIN="u-boot.img"

diff --git a/board/GenericI386/setup.sh b/board/GenericI386/setup.sh
@@ -1,5 +1,5 @@
 TARGET_ARCH=i386
-KERNCONF=GENERIC
+KERNCONF=GENERIC-NODEBUG
 IMAGE_SIZE=$((600 * 1000 * 1000))
 
 generic_i386_partition_image ( ) { 

diff --git a/board/OrangePi-One/setup.sh b/board/OrangePi-One/setup.sh
@@ -1,4 +1,4 @@
-KERNCONF=GENERIC
+KERNCONF=GENERIC-NODEBUG
 UBLDR_LOADADDR=0x42000000
 SUNXI_UBOOT="u-boot-orangepi-one"
 SUNXI_UBOOT_BIN="u-boot.img"

diff --git a/board/OrangePi-PC-Plus/setup.sh b/board/OrangePi-PC-Plus/setup.sh
@@ -1,4 +1,4 @@
-KERNCONF=GENERIC
+KERNCONF=GENERIC-NODEBUG
 UBLDR_LOADADDR=0x42000000
 SUNXI_UBOOT="u-boot-orangepi-pc-plus"
 SUNXI_UBOOT_BIN="u-boot.img"

diff --git a/board/OrangePi-Plus2E/setup.sh b/board/OrangePi-Plus2E/setup.sh
@@ -1,4 +1,4 @@
-KERNCONF=GENERIC
+KERNCONF=GENERIC-NODEBUG
 UBLDR_LOADADDR=0x42000000
 SUNXI_UBOOT="u-boot-orangepi-plus-2e"
 SUNXI_UBOOT_BIN="u-boot.img"

diff --git a/board/PandaBoard/setup.sh b/board/PandaBoard/setup.sh
@@ -1,4 +1,4 @@
-KERNCONF=GENERIC
+KERNCONF=GENERIC-NODEBUG
 PANDABOARD_UBOOT_SRC=${TOPDIR}/u-boot-2012.07
 IMAGE_SIZE=$((1000 * 1000 * 1000))
 TARGET_ARCH=armv6

diff --git a/board/Pine64/setup.sh b/board/Pine64/setup.sh
@@ -1,4 +1,4 @@
-KERNCONF=GENERIC
+KERNCONF=GENERIC-NODEBUG
 PINE64_UBOOT_PORT="u-boot-pine64"
 PINE64_UBOOT_BIN="u-boot-sunxi-with-spl.bin"
 PINE64_UBOOT_PATH="/usr/local/share/u-boot/${PINE64_UBOOT_PORT}"

diff --git a/board/RaspberryPi2/setup.sh b/board/RaspberryPi2/setup.sh
@@ -1,4 +1,4 @@
-KERNCONF=GENERIC
+KERNCONF=GENERIC-NODEBUG
 UBLDR_LOADADDR=0x2000000
 RPI_UBOOT="u-boot-rpi2"
 RPI_UBOOT_BIN="u-boot.bin"

diff --git a/board/RaspberryPi3/setup.sh b/board/RaspberryPi3/setup.sh
@@ -1,4 +1,4 @@
-KERNCONF=GENERIC
+KERNCONF=GENERIC-NODEBUG
 RPI3_UBOOT_PORT="u-boot-rpi3"
 RPI3_UBOOT_BIN="u-boot.bin"
 RPI3_UBOOT_PATH="${SHARE_PATH}/u-boot/${RPI3_UBOOT_PORT}"
@@ -7,6 +7,7 @@ RPI_FIRMWARE_BIN="bootcode.bin"
 RPI_FIRMWARE_PATH="${SHARE_PATH}/${RPI_FIRMWARE_PORT}"
 IMAGE_SIZE=$((3 * 1000 * 1000 * 1000))
 TARGET_ARCH=aarch64
+TARGET_CPUTYPE=cortex-a53
 TARGET=aarch64
 
 # Not used - just in case someone wants to use a manual ubldr.  Obtained

diff --git a/board/RaspberryPiCM3L/setup.sh b/board/RaspberryPiCM3L/setup.sh
@@ -1,9 +1,10 @@
-KERNCONF=GENERIC
+KERNCONF=GENERIC-NODEBUG
 RPI3_UBOOT_PORT="u-boot-rpi3"
 RPI3_UBOOT_BIN="u-boot.bin"
 RPI3_UBOOT_PATH="/usr/local/share/u-boot/${RPI3_UBOOT_PORT}"
 IMAGE_SIZE=$((2000 * 1000 * 1000))
 TARGET_ARCH=aarch64
+TARGET_CPUTYPE=cortex-a53
 TARGET=aarch64
 DTB_REPO="https://github.com/raspberrypi/firmware/blob/master/boot/"
 RPICM3_FIRMWARE_PORT="rpi-firmware"

diff --git a/board/VMWareGuest/setup.sh b/board/VMWareGuest/setup.sh
@@ -1,5 +1,5 @@
 TARGET_ARCH=i386
-KERNCONF=GENERIC
+KERNCONF=GENERIC-NODEBUG
 IMAGE_SIZE=$((800 * 1000 * 1000))
 
 . ${LIBDIR}/i386.sh

diff --git a/config.sh.sample b/config.sh.sample
@@ -246,6 +246,11 @@
 #
 #FREEBSD_EXTRA_ARGS=""
 
+# You can build FreeBSD with malloc debug enabled
+# by clearing FREEBSD_PRODUCTION_ARGS:
+#
+#FREEBSD_PRODUCTION_ARGS=""
+
 # Build jobs.  The number of make jobs to run in parallel.
 # Defaults to: $(sysctl -n hw.ncpu)
 #WORLDJOBS="4"

diff --git a/lib/freebsd.sh b/lib/freebsd.sh
@@ -3,6 +3,7 @@ TARGET_ARCH='needs-to-be-set-by-board-definition'
 
 # Board setup should not touch these, so users can
 FREEBSD_SRC=/usr/src
+FREEBSD_PRODUCTION_ARGS="-DMALLOC_PRODUCTION"
 FREEBSD_EXTRA_ARGS=""
 FREEBSD_WORLD_EXTRA_ARGS=""
 FREEBSD_BUILDWORLD_EXTRA_ARGS=""
@@ -206,7 +207,7 @@ if [ -z ${WORLDJOBS} ]; then
 else
 	WORLDJOBS="-j${WORLDJOBS}"
 fi
-    _FREEBSD_WORLD_ARGS="TARGET_ARCH=${TARGET_ARCH} SRCCONF=${SRCCONF} __MAKE_CONF=${__MAKE_CONF} ${FREEBSD_EXTRA_ARGS} ${FREEBSD_WORLD_EXTRA_ARGS} ${FREEBSD_WORLD_BOARD_ARGS}"
+    _FREEBSD_WORLD_ARGS="TARGET_ARCH=${TARGET_ARCH} SRCCONF=${SRCCONF} __MAKE_CONF=${__MAKE_CONF} ${FREEBSD_PRODUCTION_ARGS} ${FREEBSD_EXTRA_ARGS} ${FREEBSD_WORLD_EXTRA_ARGS} ${FREEBSD_WORLD_BOARD_ARGS}"
     if [ -n "${TARGET_CPUTYPE}" ]; then
         _FREEBSD_WORLD_ARGS="TARGET_CPUTYPE=${TARGET_CPUTYPE} ${_FREEBSD_WORLD_ARGS}"
     fi