From 9cf3c3120558c10b8ed7a1d735809713fc22f97b Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Fri, 26 Apr 2024 01:08:31 +0000 Subject: [PATCH] ANDROID: Remove ACK's support for riscv64 Support for risc64 GKI kernels is discontinued. Bug: 337124279 Change-Id: I4b41e4c346f52cbc4ddabe29e5bad2b4cc435644 Signed-off-by: Matthias Maennich --- BUILD.bazel | 78 ---- arch/riscv/configs/gki_defconfig | 653 ------------------------------- build.config.gki.riscv64 | 21 - build.config.kunit.riscv64 | 4 - build.config.riscv64 | 14 - modules.bzl | 10 +- 6 files changed, 2 insertions(+), 778 deletions(-) delete mode 100644 arch/riscv/configs/gki_defconfig delete mode 100644 build.config.gki.riscv64 delete mode 100644 build.config.kunit.riscv64 delete mode 100644 build.config.riscv64 diff --git a/BUILD.bazel b/BUILD.bazel index f2587bf8d57a..b2918fa7d3e1 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -42,13 +42,6 @@ _GKI_AARCH64_MAKE_GOALS = [ "modules", ] -_GKI_RISCV64_MAKE_GOALS = [ - "Image", - "Image.lz4", - "Image.gz", - "modules", -] - _GKI_X86_64_MAKE_GOALS = [ "bzImage", "modules", @@ -98,15 +91,6 @@ write_file( ], ) -write_file( - name = "gki_system_dlkm_modules_risc64", - out = "android/gki_system_dlkm_modules_riscv64", - content = get_gki_modules_list("riscv64") + [ - # Ensure new line at the end. - "", - ], -) - define_common_kernels(target_configs = { "kernel_aarch64": { "module_implicit_outs": get_gki_modules_list("arm64"), @@ -114,11 +98,6 @@ define_common_kernels(target_configs = { "ddk_headers_archive": ":kernel_aarch64_ddk_headers_archive", "extra_dist": [":test_mappings_zip"], }, - "kernel_riscv64": { - "module_implicit_outs": get_gki_modules_list("riscv64"), - "make_goals": _GKI_RISCV64_MAKE_GOALS, - "extra_dist": [":test_mappings_zip"], - }, "kernel_x86_64": { "kmi_symbol_list_strict_mode": False, "module_implicit_outs": get_gki_modules_list("x86_64"), @@ -807,29 +786,6 @@ copy_to_dist_dir( log = "info", ) -kernel_build( - name = "kunit_riscv64", - srcs = [":kernel_riscv64_sources"], - outs = [], - arch = "riscv64", - base_kernel = ":kernel_riscv64", - build_config = "build.config.kunit.riscv64", - defconfig_fragments = [ - "tools/testing/kunit/configs/android/kunit_defconfig", - "tools/testing/kunit/configs/android/kunit_clk_defconfig", - ], - make_goals = ["modules"], - module_outs = _KUNIT_COMMON_MODULES + _KUNIT_CLK_MODULES, -) - -copy_to_dist_dir( - name = "kunit_riscv64_dist", - data = [":kunit_riscv64"], - dist_dir = "out/kunit_riscv64/dist", - flat = True, - log = "info", -) - _KUNIT_DIR = "testcases/kunit" pkg_files( @@ -940,15 +896,6 @@ ddk_headers( visibility = ["//visibility:public"], ) -ddk_headers( - name = "all_headers_riscv64", - hdrs = [":all_headers_allowlist_riscv64"] + select({ - "//build/kernel/kleaf:allow_ddk_unsafe_headers_set": [":all_headers_unsafe"], - "//conditions:default": [], - }), - visibility = ["//visibility:public"], -) - ddk_headers( name = "all_headers_x86_64", hdrs = [":all_headers_allowlist_x86_64"] + select({ @@ -999,24 +946,6 @@ ddk_headers( visibility = ["//visibility:private"], ) -ddk_headers( - name = "all_headers_allowlist_riscv64", - hdrs = [ - ":all_headers_allowlist_common_globs", - ":all_headers_allowlist_riscv64_globs", - ], - # The list of include directories where source files can #include headers - # from. In other words, these are the `-I` option to the C compiler. - # These are prepended to LINUXINCLUDE. - linux_includes = [ - "arch/riscv/include", - "arch/riscv/include/uapi", - "include", - "include/uapi", - ], - visibility = ["//visibility:private"], -) - ddk_headers( name = "all_headers_allowlist_x86_64", hdrs = [ @@ -1055,13 +984,6 @@ filegroup( visibility = ["//visibility:private"], ) -# globs() for riscv64 only -filegroup( - name = "all_headers_allowlist_riscv64_globs", - srcs = glob(["arch/riscv/include/**/*.h"]), - visibility = ["//visibility:private"], -) - # globs() for x86 only filegroup( name = "all_headers_allowlist_x86_64_globs", diff --git a/arch/riscv/configs/gki_defconfig b/arch/riscv/configs/gki_defconfig deleted file mode 100644 index 8fbf6aacd4e8..000000000000 --- a/arch/riscv/configs/gki_defconfig +++ /dev/null @@ -1,653 +0,0 @@ -CONFIG_AUDIT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_BPF_SYSCALL=y -CONFIG_BPF_JIT=y -CONFIG_BPF_JIT_ALWAYS_ON=y -# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set -CONFIG_PREEMPT=y -CONFIG_IRQ_TIME_ACCOUNTING=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_PSI=y -CONFIG_RCU_EXPERT=y -CONFIG_RCU_BOOST=y -CONFIG_RCU_NOCB_CPU=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_IKHEADERS=m -CONFIG_UCLAMP_TASK=y -CONFIG_UCLAMP_BUCKETS_COUNT=20 -CONFIG_CGROUPS=y -CONFIG_MEMCG=y -CONFIG_BLK_CGROUP=y -CONFIG_CGROUP_SCHED=y -CONFIG_UCLAMP_TASK_GROUP=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CPUSETS=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_CGROUP_BPF=y -CONFIG_NAMESPACES=y -# CONFIG_PID_NS is not set -# CONFIG_RD_BZIP2 is not set -# CONFIG_RD_LZMA is not set -# CONFIG_RD_XZ is not set -# CONFIG_RD_LZO is not set -CONFIG_BOOT_CONFIG=y -CONFIG_EXPERT=y -# CONFIG_SYSFS_SYSCALL is not set -# CONFIG_FHANDLE is not set -# CONFIG_RSEQ is not set -CONFIG_PROFILING=y -CONFIG_ARCH_SUNXI=y -CONFIG_NONPORTABLE=y -CONFIG_SMP=y -CONFIG_SCHED_MC=y -CONFIG_NR_CPUS=32 -CONFIG_RISCV_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_RANDOMIZE_BASE=y -CONFIG_CMDLINE="console=ttynull stack_depot_disable=on cgroup_disable=pressure kasan.stacktrace=off kvm-arm.mode=protected bootconfig ioremap_guard" -CONFIG_PM_WAKELOCKS=y -CONFIG_PM_WAKELOCKS_LIMIT=0 -# CONFIG_PM_WAKELOCKS_GC is not set -CONFIG_PM_DEBUG=y -CONFIG_PM_ADVANCED_DEBUG=y -CONFIG_ENERGY_MODEL=y -CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_GOV_MENU=y -CONFIG_CPU_IDLE_GOV_TEO=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_TIMES=y -CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=y -CONFIG_KPROBES=y -CONFIG_JUMP_LABEL=y -CONFIG_SHADOW_CALL_STACK=y -CONFIG_CFI_CLANG=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_MODULE_SCMVERSION=y -CONFIG_MODULE_SIG=y -CONFIG_MODULE_SIG_PROTECT=y -CONFIG_MODPROBE_PATH="" -CONFIG_BLK_DEV_ZONED=y -CONFIG_BLK_CGROUP_IOPRIO=y -CONFIG_BLK_INLINE_ENCRYPTION=y -CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y -CONFIG_GKI_HACKS_TO_FIX=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_BINFMT_MISC=y -# CONFIG_SLAB_MERGE_DEFAULT is not set -CONFIG_SLAB_FREELIST_RANDOM=y -CONFIG_SLAB_FREELIST_HARDENED=y -CONFIG_SHUFFLE_PAGE_ALLOCATOR=y -# CONFIG_COMPAT_BRK is not set -CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 -CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y -CONFIG_CMA=y -CONFIG_CMA_DEBUGFS=y -CONFIG_CMA_AREAS=16 -CONFIG_ANON_VMA_NAME=y -CONFIG_USERFAULTFD=y -CONFIG_LRU_GEN=y -CONFIG_LRU_GEN_ENABLED=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_XFRM_INTERFACE=y -CONFIG_XFRM_MIGRATE=y -CONFIG_XFRM_STATISTICS=y -CONFIG_NET_KEY=y -CONFIG_XDP_SOCKETS=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_NET_IPIP=y -CONFIG_NET_IPGRE_DEMUX=y -CONFIG_NET_IPGRE=y -CONFIG_NET_IPVTI=y -CONFIG_INET_ESP=y -CONFIG_INET_UDP_DIAG=y -CONFIG_INET_DIAG_DESTROY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_ESP=y -CONFIG_INET6_IPCOMP=y -CONFIG_IPV6_MIP6=y -CONFIG_IPV6_VTI=y -CONFIG_IPV6_GRE=y -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_MROUTE=y -CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y -CONFIG_NETFILTER=y -CONFIG_NF_CONNTRACK=y -CONFIG_NF_CONNTRACK_SECMARK=y -CONFIG_NF_CONNTRACK_PROCFS=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CONNTRACK_AMANDA=y -CONFIG_NF_CONNTRACK_FTP=y -CONFIG_NF_CONNTRACK_H323=y -CONFIG_NF_CONNTRACK_IRC=y -CONFIG_NF_CONNTRACK_NETBIOS_NS=y -CONFIG_NF_CONNTRACK_PPTP=y -CONFIG_NF_CONNTRACK_SANE=y -CONFIG_NF_CONNTRACK_TFTP=y -CONFIG_NF_CT_NETLINK=y -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y -CONFIG_NETFILTER_XT_TARGET_CONNMARK=y -CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y -CONFIG_NETFILTER_XT_TARGET_DSCP=y -CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y -CONFIG_NETFILTER_XT_TARGET_MARK=y -CONFIG_NETFILTER_XT_TARGET_NFLOG=y -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y -CONFIG_NETFILTER_XT_TARGET_NOTRACK=y -CONFIG_NETFILTER_XT_TARGET_TEE=y -CONFIG_NETFILTER_XT_TARGET_TPROXY=y -CONFIG_NETFILTER_XT_TARGET_TRACE=y -CONFIG_NETFILTER_XT_TARGET_SECMARK=y -CONFIG_NETFILTER_XT_TARGET_TCPMSS=y -CONFIG_NETFILTER_XT_MATCH_BPF=y -CONFIG_NETFILTER_XT_MATCH_COMMENT=y -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y -CONFIG_NETFILTER_XT_MATCH_CONNMARK=y -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -CONFIG_NETFILTER_XT_MATCH_DSCP=y -CONFIG_NETFILTER_XT_MATCH_ESP=y -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y -CONFIG_NETFILTER_XT_MATCH_HELPER=y -CONFIG_NETFILTER_XT_MATCH_IPRANGE=y -CONFIG_NETFILTER_XT_MATCH_L2TP=y -CONFIG_NETFILTER_XT_MATCH_LENGTH=y -CONFIG_NETFILTER_XT_MATCH_LIMIT=y -CONFIG_NETFILTER_XT_MATCH_MAC=y -CONFIG_NETFILTER_XT_MATCH_MARK=y -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y -CONFIG_NETFILTER_XT_MATCH_OWNER=y -CONFIG_NETFILTER_XT_MATCH_POLICY=y -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y -CONFIG_NETFILTER_XT_MATCH_QUOTA=y -CONFIG_NETFILTER_XT_MATCH_QUOTA2=y -CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y -CONFIG_NETFILTER_XT_MATCH_SOCKET=y -CONFIG_NETFILTER_XT_MATCH_STATE=y -CONFIG_NETFILTER_XT_MATCH_STATISTIC=y -CONFIG_NETFILTER_XT_MATCH_STRING=y -CONFIG_NETFILTER_XT_MATCH_TIME=y -CONFIG_NETFILTER_XT_MATCH_U32=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_MATCH_ECN=y -CONFIG_IP_NF_MATCH_TTL=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_TARGET_REJECT=y -CONFIG_IP_NF_NAT=y -CONFIG_IP_NF_TARGET_MASQUERADE=y -CONFIG_IP_NF_TARGET_NETMAP=y -CONFIG_IP_NF_TARGET_REDIRECT=y -CONFIG_IP_NF_MANGLE=y -CONFIG_IP_NF_RAW=y -CONFIG_IP_NF_SECURITY=y -CONFIG_IP_NF_ARPFILTER=y -CONFIG_IP_NF_ARP_MANGLE=y -CONFIG_IP6_NF_IPTABLES=y -CONFIG_IP6_NF_MATCH_RPFILTER=y -CONFIG_IP6_NF_FILTER=y -CONFIG_IP6_NF_TARGET_REJECT=y -CONFIG_IP6_NF_MANGLE=y -CONFIG_IP6_NF_RAW=y -CONFIG_TIPC=m -CONFIG_L2TP=m -CONFIG_BRIDGE=y -CONFIG_VLAN_8021Q=m -CONFIG_6LOWPAN=m -CONFIG_IEEE802154=m -CONFIG_IEEE802154_6LOWPAN=m -CONFIG_MAC802154=m -CONFIG_NET_SCHED=y -CONFIG_NET_SCH_HTB=y -CONFIG_NET_SCH_PRIO=y -CONFIG_NET_SCH_MULTIQ=y -CONFIG_NET_SCH_SFQ=y -CONFIG_NET_SCH_TBF=y -CONFIG_NET_SCH_NETEM=y -CONFIG_NET_SCH_CODEL=y -CONFIG_NET_SCH_FQ_CODEL=y -CONFIG_NET_SCH_FQ=y -CONFIG_NET_SCH_INGRESS=y -CONFIG_NET_CLS_BASIC=y -CONFIG_NET_CLS_FW=y -CONFIG_NET_CLS_U32=y -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_FLOW=y -CONFIG_NET_CLS_BPF=y -CONFIG_NET_CLS_MATCHALL=y -CONFIG_NET_EMATCH=y -CONFIG_NET_EMATCH_CMP=y -CONFIG_NET_EMATCH_NBYTE=y -CONFIG_NET_EMATCH_U32=y -CONFIG_NET_EMATCH_META=y -CONFIG_NET_EMATCH_TEXT=y -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=y -CONFIG_NET_ACT_GACT=y -CONFIG_NET_ACT_MIRRED=y -CONFIG_NET_ACT_SKBEDIT=y -CONFIG_NET_ACT_BPF=y -CONFIG_VSOCKETS=y -CONFIG_CGROUP_NET_PRIO=y -CONFIG_CAN=m -CONFIG_BT=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_HIDP=m -CONFIG_BT_HCIBTSDIO=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_LL=y -CONFIG_BT_HCIUART_BCM=y -CONFIG_BT_HCIUART_QCA=y -CONFIG_RFKILL=m -CONFIG_NFC=m -CONFIG_PCI=y -CONFIG_PCIEPORTBUS=y -CONFIG_PCIEAER=y -CONFIG_PCI_IOV=y -# CONFIG_VGA_ARB is not set -CONFIG_PCI_HOST_GENERIC=y -CONFIG_PCIE_DW_PLAT_EP=y -CONFIG_PCI_ENDPOINT=y -CONFIG_FW_LOADER_USER_HELPER=y -# CONFIG_FW_CACHE is not set -CONFIG_GNSS=y -CONFIG_ZRAM=m -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_LOOP_MIN_COUNT=16 -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_SRAM=y -CONFIG_UID_SYS_STATS=y -CONFIG_SCSI=y -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=y -CONFIG_MD=y -CONFIG_BLK_DEV_DM=y -CONFIG_DM_CRYPT=y -CONFIG_DM_DEFAULT_KEY=y -CONFIG_DM_SNAPSHOT=y -CONFIG_DM_UEVENT=y -CONFIG_DM_VERITY=y -CONFIG_DM_VERITY_FEC=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_WIREGUARD=y -CONFIG_IFB=y -CONFIG_MACSEC=m -CONFIG_TUN=y -CONFIG_VETH=y -CONFIG_LED_TRIGGER_PHY=y -CONFIG_AX88796B_PHY=y -CONFIG_CAN_VCAN=m -CONFIG_CAN_SLCAN=m -CONFIG_PPP=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_MPPE=m -CONFIG_PPTP=m -CONFIG_PPPOL2TP=m -CONFIG_USB_NET_DRIVERS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_RTL8152=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_CDC_EEM=m -# CONFIG_USB_NET_NET1080 is not set -# CONFIG_USB_NET_CDC_SUBSET is not set -# CONFIG_USB_NET_ZAURUS is not set -CONFIG_USB_NET_AQC111=m -# CONFIG_WLAN_VENDOR_ADMTEK is not set -# CONFIG_WLAN_VENDOR_ATH is not set -# CONFIG_WLAN_VENDOR_ATMEL is not set -# CONFIG_WLAN_VENDOR_BROADCOM is not set -# CONFIG_WLAN_VENDOR_INTEL is not set -# CONFIG_WLAN_VENDOR_INTERSIL is not set -# CONFIG_WLAN_VENDOR_MARVELL is not set -# CONFIG_WLAN_VENDOR_MEDIATEK is not set -# CONFIG_WLAN_VENDOR_RALINK is not set -# CONFIG_WLAN_VENDOR_REALTEK is not set -# CONFIG_WLAN_VENDOR_RSI is not set -# CONFIG_WLAN_VENDOR_ST is not set -# CONFIG_WLAN_VENDOR_TI is not set -# CONFIG_WLAN_VENDOR_ZYDAS is not set -# CONFIG_WLAN_VENDOR_QUANTENNA is not set -CONFIG_WWAN=m -# CONFIG_WWAN_DEBUGFS is not set -CONFIG_INPUT_EVDEV=y -CONFIG_KEYBOARD_GPIO=y -# CONFIG_MOUSE_PS2 is not set -CONFIG_INPUT_JOYSTICK=y -CONFIG_JOYSTICK_XPAD=y -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -# CONFIG_VT is not set -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_8250=y -# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -CONFIG_SERIAL_8250_CONSOLE=y -# CONFIG_SERIAL_8250_EXAR is not set -CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=0 -CONFIG_SERIAL_8250_DW=y -CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_SERIAL_SAMSUNG=y -CONFIG_SERIAL_SAMSUNG_CONSOLE=y -CONFIG_SERIAL_SPRD=y -CONFIG_SERIAL_SPRD_CONSOLE=y -CONFIG_NULL_TTY=y -CONFIG_SERIAL_DEV_BUS=y -CONFIG_HW_RANDOM=y -# CONFIG_DEVMEM is not set -# CONFIG_DEVPORT is not set -# CONFIG_I2C_COMPAT is not set -# CONFIG_I2C_HELPER_AUTO is not set -CONFIG_I3C=y -CONFIG_SPI=y -CONFIG_SPI_MEM=y -CONFIG_SPI_SLAVE=y -CONFIG_PTP_1588_CLOCK=m -CONFIG_PINCTRL=y -CONFIG_GPIO_GENERIC_PLATFORM=y -CONFIG_POWER_RESET=y -CONFIG_POWER_RESET_SYSCON=y -# CONFIG_HWMON is not set -CONFIG_THERMAL=y -CONFIG_THERMAL_NETLINK=y -CONFIG_THERMAL_STATISTICS=y -CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=100 -CONFIG_THERMAL_WRITABLE_TRIPS=y -CONFIG_THERMAL_GOV_BANG_BANG=y -CONFIG_THERMAL_GOV_USER_SPACE=y -CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y -CONFIG_CPU_THERMAL=y -CONFIG_DEVFREQ_THERMAL=y -CONFIG_THERMAL_EMULATION=y -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_CORE=y -CONFIG_MFD_ACT8945A=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_RC_CORE=y -CONFIG_BPF_LIRC_MODE2=y -CONFIG_LIRC=y -# CONFIG_RC_MAP is not set -CONFIG_RC_DECODERS=y -CONFIG_RC_DEVICES=y -CONFIG_MEDIA_CEC_RC=y -# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set -# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set -# CONFIG_MEDIA_RADIO_SUPPORT is not set -# CONFIG_MEDIA_SDR_SUPPORT is not set -# CONFIG_MEDIA_TEST_SUPPORT is not set -CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_USB_GSPCA=y -CONFIG_USB_VIDEO_CLASS=y -CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_DRM=y -# CONFIG_DRM_DEBUG_MODESET_LOCK is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_HRTIMER=y -# CONFIG_SND_SUPPORT_OLD_API is not set -# CONFIG_SND_VERBOSE_PROCFS is not set -# CONFIG_SND_DRIVERS is not set -CONFIG_SND_USB_AUDIO=y -CONFIG_SND_SOC=y -CONFIG_HID_BATTERY_STRENGTH=y -CONFIG_HIDRAW=y -CONFIG_UHID=y -CONFIG_HID_APPLE=y -CONFIG_HID_PRODIKEYS=y -CONFIG_HID_ELECOM=y -CONFIG_HID_UCLOGIC=y -CONFIG_HID_LOGITECH=y -CONFIG_HID_LOGITECH_DJ=y -CONFIG_HID_MAGICMOUSE=y -CONFIG_HID_MICROSOFT=y -CONFIG_HID_MULTITOUCH=y -CONFIG_HID_NINTENDO=y -CONFIG_HID_PICOLCD=y -CONFIG_HID_PLANTRONICS=y -CONFIG_HID_PLAYSTATION=y -CONFIG_PLAYSTATION_FF=y -CONFIG_HID_ROCCAT=y -CONFIG_HID_SONY=y -CONFIG_SONY_FF=y -CONFIG_HID_STEAM=y -CONFIG_HID_WACOM=y -CONFIG_HID_WIIMOTE=y -CONFIG_USB_HIDDEV=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_OTG=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_HCD_PLATFORM=y -CONFIG_USB_ACM=m -CONFIG_USB_STORAGE=y -CONFIG_USB_UAS=y -CONFIG_USB_DWC3=y -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_GADGET=y -CONFIG_USB_CONFIGFS=y -CONFIG_USB_CONFIGFS_SERIAL=y -CONFIG_USB_CONFIGFS_ACM=y -CONFIG_USB_CONFIGFS_NCM=y -CONFIG_USB_CONFIGFS_ECM=y -CONFIG_USB_CONFIGFS_EEM=y -CONFIG_USB_CONFIGFS_MASS_STORAGE=y -CONFIG_USB_CONFIGFS_F_FS=y -CONFIG_USB_CONFIGFS_F_UAC2=y -CONFIG_USB_CONFIGFS_F_MIDI=y -CONFIG_USB_CONFIGFS_F_HID=y -CONFIG_USB_CONFIGFS_F_UVC=y -CONFIG_TYPEC=y -CONFIG_TYPEC_TCPM=y -CONFIG_TYPEC_TCPCI=y -CONFIG_TYPEC_UCSI=y -CONFIG_TYPEC_DP_ALTMODE=y -CONFIG_MMC=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set -CONFIG_MMC_CRYPTO=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_SCSI_UFSHCD=y -CONFIG_SCSI_UFS_BSG=y -CONFIG_SCSI_UFS_CRYPTO=y -CONFIG_SCSI_UFSHCD_PCI=y -CONFIG_SCSI_UFSHCD_PLATFORM=y -CONFIG_SCSI_UFS_DWC_TC_PLATFORM=y -CONFIG_LEDS_CLASS_FLASH=y -CONFIG_LEDS_CLASS_MULTICOLOR=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_TRANSIENT=y -CONFIG_EDAC=y -CONFIG_RTC_CLASS=y -CONFIG_DMABUF_HEAPS=y -CONFIG_UIO=y -CONFIG_VHOST_VSOCK=y -CONFIG_STAGING=y -CONFIG_ASHMEM=y -# CONFIG_SUNXI_CCU is not set -CONFIG_HWSPINLOCK=y -CONFIG_MAILBOX=y -CONFIG_REMOTEPROC=y -CONFIG_REMOTEPROC_CDEV=y -CONFIG_RPMSG_CHAR=y -CONFIG_DEVFREQ_GOV_PERFORMANCE=y -CONFIG_DEVFREQ_GOV_POWERSAVE=y -CONFIG_DEVFREQ_GOV_USERSPACE=y -CONFIG_DEVFREQ_GOV_PASSIVE=y -CONFIG_PM_DEVFREQ_EVENT=y -CONFIG_IIO=y -CONFIG_IIO_BUFFER=y -CONFIG_IIO_TRIGGER=y -CONFIG_PWM=y -CONFIG_RESET_CONTROLLER=y -CONFIG_POWERCAP=y -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_BINDERFS=y -CONFIG_ANDROID_VENDOR_HOOKS=y -CONFIG_LIBNVDIMM=y -CONFIG_INTERCONNECT=y -CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_SECURITY=y -CONFIG_F2FS_FS_COMPRESSION=y -CONFIG_F2FS_UNFAIR_RWSEM=y -CONFIG_FS_ENCRYPTION=y -CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y -CONFIG_FS_VERITY=y -# CONFIG_DNOTIFY is not set -CONFIG_QUOTA=y -CONFIG_QFMT_V2=y -CONFIG_FUSE_FS=y -CONFIG_VIRTIO_FS=y -CONFIG_OVERLAY_FS=y -CONFIG_INCREMENTAL_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_EXFAT_FS=y -CONFIG_TMPFS=y -# CONFIG_EFIVAR_FS is not set -CONFIG_PSTORE=y -CONFIG_PSTORE_CONSOLE=y -CONFIG_PSTORE_PMSG=y -CONFIG_PSTORE_RAM=y -CONFIG_EROFS_FS=y -CONFIG_EROFS_FS_PCPU_KTHREAD=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=y -CONFIG_NLS_CODEPAGE_775=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_CODEPAGE_852=y -CONFIG_NLS_CODEPAGE_855=y -CONFIG_NLS_CODEPAGE_857=y -CONFIG_NLS_CODEPAGE_860=y -CONFIG_NLS_CODEPAGE_861=y -CONFIG_NLS_CODEPAGE_862=y -CONFIG_NLS_CODEPAGE_863=y -CONFIG_NLS_CODEPAGE_864=y -CONFIG_NLS_CODEPAGE_865=y -CONFIG_NLS_CODEPAGE_866=y -CONFIG_NLS_CODEPAGE_869=y -CONFIG_NLS_CODEPAGE_936=y -CONFIG_NLS_CODEPAGE_950=y -CONFIG_NLS_CODEPAGE_932=y -CONFIG_NLS_CODEPAGE_949=y -CONFIG_NLS_CODEPAGE_874=y -CONFIG_NLS_ISO8859_8=y -CONFIG_NLS_CODEPAGE_1250=y -CONFIG_NLS_CODEPAGE_1251=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=y -CONFIG_NLS_ISO8859_3=y -CONFIG_NLS_ISO8859_4=y -CONFIG_NLS_ISO8859_5=y -CONFIG_NLS_ISO8859_6=y -CONFIG_NLS_ISO8859_7=y -CONFIG_NLS_ISO8859_9=y -CONFIG_NLS_ISO8859_13=y -CONFIG_NLS_ISO8859_14=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_KOI8_R=y -CONFIG_NLS_KOI8_U=y -CONFIG_NLS_MAC_ROMAN=y -CONFIG_NLS_MAC_CELTIC=y -CONFIG_NLS_MAC_CENTEURO=y -CONFIG_NLS_MAC_CROATIAN=y -CONFIG_NLS_MAC_CYRILLIC=y -CONFIG_NLS_MAC_GAELIC=y -CONFIG_NLS_MAC_GREEK=y -CONFIG_NLS_MAC_ICELAND=y -CONFIG_NLS_MAC_INUIT=y -CONFIG_NLS_MAC_ROMANIAN=y -CONFIG_NLS_MAC_TURKISH=y -CONFIG_NLS_UTF8=y -CONFIG_UNICODE=y -CONFIG_SECURITY=y -CONFIG_SECURITYFS=y -CONFIG_SECURITY_NETWORK=y -CONFIG_LSM_MMAP_MIN_ADDR=32768 -CONFIG_HARDENED_USERCOPY=y -CONFIG_FORTIFY_SOURCE=y -CONFIG_STATIC_USERMODEHELPER=y -CONFIG_STATIC_USERMODEHELPER_PATH="" -CONFIG_SECURITY_SELINUX=y -CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y -CONFIG_BUG_ON_DATA_CORRUPTION=y -CONFIG_CRYPTO_ECDH=y -CONFIG_CRYPTO_DES=y -CONFIG_CRYPTO_ADIANTUM=y -CONFIG_CRYPTO_HCTR2=y -CONFIG_CRYPTO_CHACHA20POLY1305=y -CONFIG_CRYPTO_CCM=y -CONFIG_CRYPTO_BLAKE2B=y -CONFIG_CRYPTO_CMAC=y -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_XCBC=y -CONFIG_CRYPTO_LZO=y -CONFIG_CRYPTO_LZ4=y -CONFIG_CRYPTO_ZSTD=y -CONFIG_CRYPTO_ANSI_CPRNG=y -CONFIG_CRC_CCITT=y -CONFIG_CRC8=y -CONFIG_XZ_DEC=y -CONFIG_SWIOTLB_DYNAMIC=y -CONFIG_DMA_CMA=y -CONFIG_PRINTK_TIME=y -CONFIG_PRINTK_CALLER=y -CONFIG_DYNAMIC_DEBUG_CORE=y -CONFIG_DEBUG_INFO_DWARF5=y -CONFIG_DEBUG_INFO_COMPRESSED_ZSTD=y -CONFIG_HEADERS_INSTALL=y -# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_UBSAN=y -CONFIG_UBSAN_TRAP=y -# CONFIG_UBSAN_BOOL is not set -# CONFIG_UBSAN_ENUM is not set -CONFIG_PAGE_OWNER=y -CONFIG_DEBUG_STACK_USAGE=y -CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_KFENCE=y -CONFIG_KFENCE_SAMPLE_INTERVAL=500 -CONFIG_KFENCE_NUM_OBJECTS=63 -CONFIG_KFENCE_STATIC_KEYS=y -CONFIG_PANIC_ON_OOPS=y -CONFIG_PANIC_TIMEOUT=-1 -CONFIG_SOFTLOCKUP_DETECTOR=y -CONFIG_WQ_WATCHDOG=y -CONFIG_SCHEDSTATS=y -CONFIG_PROVE_LOCKING=y -CONFIG_SYNTH_EVENTS=y -CONFIG_KUNIT=y -CONFIG_KUNIT_DEBUGFS=y -# CONFIG_KUNIT_DEFAULT_ENABLED is not set -# CONFIG_RUNTIME_TESTING_MENU is not set diff --git a/build.config.gki.riscv64 b/build.config.gki.riscv64 deleted file mode 100644 index 859f4d105674..000000000000 --- a/build.config.gki.riscv64 +++ /dev/null @@ -1,21 +0,0 @@ -. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common -. ${ROOT_DIR}/${KERNEL_DIR}/build.config.riscv64 -. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki - -FILES="${FILES} -arch/riscv/boot/Image.lz4 -arch/riscv/boot/Image.gz -" - -BUILD_SYSTEM_DLKM=1 - -BUILD_GKI_CERTIFICATION_TOOLS=1 - -BUILD_GKI_ARTIFACTS=1 -BUILD_GKI_BOOT_IMG_SIZE=67108864 -BUILD_GKI_BOOT_IMG_GZ_SIZE=47185920 -BUILD_GKI_BOOT_IMG_LZ4_SIZE=53477376 - -if [ -n "${GKI_BUILD_CONFIG_FRAGMENT}" ]; then -source ${GKI_BUILD_CONFIG_FRAGMENT} -fi diff --git a/build.config.kunit.riscv64 b/build.config.kunit.riscv64 deleted file mode 100644 index 994b70ead51d..000000000000 --- a/build.config.kunit.riscv64 +++ /dev/null @@ -1,4 +0,0 @@ -. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common -. ${ROOT_DIR}/${KERNEL_DIR}/build.config.riscv64 - -DEFCONFIG=gki_defconfig diff --git a/build.config.riscv64 b/build.config.riscv64 deleted file mode 100644 index 0ef054b61a84..000000000000 --- a/build.config.riscv64 +++ /dev/null @@ -1,14 +0,0 @@ -ARCH=riscv -MAKE_GOALS=" -Image -modules -" - -FILES=" -arch/riscv/boot/Image -vmlinux -System.map -vmlinux.symvers -modules.builtin -modules.builtin.modinfo -" diff --git a/modules.bzl b/modules.bzl index 173d5b2e1e0e..87989e775abd 100644 --- a/modules.bzl +++ b/modules.bzl @@ -85,10 +85,6 @@ _ARM64_GKI_MODULES_LIST = [ "drivers/ptp/ptp_kvm.ko", ] -_RISCV64_GKI_MODULES_LIST = [ - # keep sorted -] - _X86_GKI_MODULES_LIST = [ # keep sorted "drivers/ptp/ptp_kvm.ko", @@ -104,7 +100,7 @@ def get_gki_modules_list(arch = None): """ Provides the list of GKI modules. Args: - arch: One of [arm, arm64, i386, x86_64, riscv64]. + arch: One of [arm, arm64, i386, x86_64]. Returns: The list of GKI modules for the given |arch|. @@ -118,10 +114,8 @@ def get_gki_modules_list(arch = None): gki_modules_list += _X86_GKI_MODULES_LIST elif arch == "x86_64": gki_modules_list += _X86_64_GKI_MODULES_LIST - elif arch == "riscv64": - gki_modules_list += _RISCV64_GKI_MODULES_LIST else: - fail("{}: arch {} not supported. Use one of [arm, arm64, i386, x86_64, riscv64]".format( + fail("{}: arch {} not supported. Use one of [arm, arm64, i386, x86_64]".format( str(native.package_relative_label(":x")).removesuffix(":x"), arch, ))