port-arm/54551: error with custom kernel config aarch64

[mujo%sdf.org@localhost]

>Number:         54551
>Category:       port-arm
>Synopsis:       error with custom kernel config aarch64
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    port-arm-maintainer
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Sep 17 07:35:00 +0000 2019
>Originator:     Ian
>Release:        NetBSD 9.0_BETA
>Organization:
>Environment:
NetBSD hedges.my.domain 9.0_BETA NetBSD 9.0_BETA (MYKERNEL) #0: Tue Sep  3 00:49:18 UTC 2019  ioh@hedges:/usr/src/sys/arch/evbarm/compile/MYKERNEL evbarm

>Description:
Make failure with a custom kernel 
In file included from ../../../../arch/arm/broadcom/bcm2835_bsc.c:47:0:
../../../../arch/arm/broadcom/bcm2835reg.h:44:2: error: #error Must define SOC_BCM2835 or SOC_BCM2836, and not both
 #error Must define SOC_BCM2835 or SOC_BCM2836, and not both
  ^~~~~


>How-To-Repeat:
cd sys/arch/evbarm/conf
cp GENERIC64 MYKERNEL
sed -i '/SOC_BCM2837/d'
cd ../compile/MYKERNEL
make depend && make

....
#    create  MYKERNEL/bcm2835_bsc.d
mkdep -f bcm2835_bsc.d.tmp --  -march=armv8-a+nofp+nosimd -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -ffreestanding -fno-zero-initialized-in-bss  -fno-delete-null-pointer-checks  -g -Os -fno-strict-aliasing -fno-common     -std=gnu99   -Werror -Wall -Wno-main -Wno-format-zero-length -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes -Wold-style-definition -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -Wno-unreachable-code -Wno-pointer-sign -Wno-attributes -Wno-sign-compare   -march=native   -I. -I../../../../external/bsd/acpica/dist -I../../../../external/bsd/libnv/dist -I../../../../../common/lib/libx86emu -I../../../../../common/lib/libc/misc -I../../../../../common/include -I../../../../arch  -I../../../.. -nostdinc -DCOMPAT_UTILS  -DAARCH64  -DARM_GENERIC_TODR  -DFPU_VFP  -D__HAVE_PCI_CONF_HOOK  -D__HAVE_PCI_MSI_MSIX  -DDISKLABEL_EI  -DCOMPAT_44  -DDIAGNOSTIC -D_KERNEL -D_KERNEL_OPT -std=gnu99 -I../../../../lib/libkern/../../../common/lib/libc/quad -I../../../../l
 ib/libkern/../../../common/lib/libc/string -I../../../../lib/libkern/../../../common/lib/libc/arch/aarch64/string   -I../../../../external/bsd/common/include -I../../../../external/bsd/common/include -I../../../../external/bsd/drm2/include -I../../../../external/bsd/drm2/include -I../../../../external/bsd/common/include -I../../../../external/bsd/drm2/dist/include -I../../../../external/bsd/drm2/dist/include/drm -I../../../../external/bsd/drm2/dist/uapi -I../../../../external/bsd/drm2/dist -D__KERNEL__ -DCONFIG_BACKLIGHT_CLASS_DEVICE=0 -DCONFIG_BACKLIGHT_CLASS_DEVICE_MODULE=0 -DCONFIG_DRM_FBDEV_EMULATION=1 -DCONFIG_FB=0 -I../../../../external/bsd -I../../../../external/bsd/dwc2/dist -I../../../../external/bsd/libfdt/dist -I../../../../external/bsd/libnv/dist -I../../../../external/bsd/acpica/dist/include  ../../../../arch/arm/broadcom/bcm2835_bsc.c
In file included from ../../../../arch/arm/broadcom/bcm2835_bsc.c:47:0:
../../../../arch/arm/broadcom/bcm2835reg.h:44:2: error: #error Must define SOC_BCM2835 or SOC_BCM2836, and not both
 #error Must define SOC_BCM2835 or SOC_BCM2836, and not both
  ^~~~~
mkdep: compile failed.
*** Error code 1

Stop.
make: stopped in /usr/src/sys/arch/evbarm/compile/MYKERNEL

>Fix: