Commit 03e61914 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'm68k-for-v4.19-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:

 - Enable mac_scsi PDMA on PowerBook 500

 - Generic dma_noncoherent_ops conversion

 - Time handling improvements

 - I/O accessor improvements

 - Conversion to MEMBLOCK and NO_BOOTMEM, to bring m68k in line with
   other mainstream architectures

 - Miscellaneous fixes and cleanups

 - Defconfig updates

* tag 'm68k-for-v4.19-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/defconfig: Update defconfigs for v4.18-rc6
  m68k: switch to MEMBLOCK + NO_BOOTMEM
  m68k/page_no.h: force __va argument to be unsigned long
  m68k/bitops: convert __ffs to match generic declaration
  m68k/io: Switch mmu variant to <asm-generic/io.h>
  m68k/io: Move mem*io define guards to <asm/kmap.h>
  Input: hilkbd - Add casts to HP9000/300 I/O accessors
  net: mac8390: Use standard memcpy_{from,to}io()
  m68k/io: Add missing ioremap define guards, fix typo
  m68k: Remove unused set_clock_mmss() helpers
  m68k: mac: Use time64_t in RTC handling
  m68k: Use generic dma_noncoherent_ops
  nubus: Set default dma mask for nubus_board devices
  m68k/mac: Enable PDMA for PowerBook 500 series
parents 94710cac 71a89668
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
config M68K config M68K
bool bool
default y default y
select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA
select ARCH_MIGHT_HAVE_PC_PARPORT if ISA select ARCH_MIGHT_HAVE_PC_PARPORT if ISA
select ARCH_NO_COHERENT_DMA_MMAP if !MMU select ARCH_NO_COHERENT_DMA_MMAP if !MMU
select HAVE_IDE select HAVE_IDE
...@@ -24,6 +25,10 @@ config M68K ...@@ -24,6 +25,10 @@ config M68K
select MODULES_USE_ELF_RELA select MODULES_USE_ELF_RELA
select OLD_SIGSUSPEND3 select OLD_SIGSUSPEND3
select OLD_SIGACTION select OLD_SIGACTION
select DMA_NONCOHERENT_OPS if HAS_DMA
select HAVE_MEMBLOCK
select ARCH_DISCARD_MEMBLOCK
select NO_BOOTMEM
config CPU_BIG_ENDIAN config CPU_BIG_ENDIAN
def_bool y def_bool y
......
...@@ -31,7 +31,6 @@ extern void dn_sched_init(irq_handler_t handler); ...@@ -31,7 +31,6 @@ extern void dn_sched_init(irq_handler_t handler);
extern void dn_init_IRQ(void); extern void dn_init_IRQ(void);
extern u32 dn_gettimeoffset(void); extern u32 dn_gettimeoffset(void);
extern int dn_dummy_hwclk(int, struct rtc_time *); extern int dn_dummy_hwclk(int, struct rtc_time *);
extern int dn_dummy_set_clock_mmss(unsigned long);
extern void dn_dummy_reset(void); extern void dn_dummy_reset(void);
#ifdef CONFIG_HEARTBEAT #ifdef CONFIG_HEARTBEAT
static void dn_heartbeat(int on); static void dn_heartbeat(int on);
...@@ -156,7 +155,6 @@ void __init config_apollo(void) ...@@ -156,7 +155,6 @@ void __init config_apollo(void)
arch_gettimeoffset = dn_gettimeoffset; arch_gettimeoffset = dn_gettimeoffset;
mach_max_dma_address = 0xffffffff; mach_max_dma_address = 0xffffffff;
mach_hwclk = dn_dummy_hwclk; /* */ mach_hwclk = dn_dummy_hwclk; /* */
mach_set_clock_mmss = dn_dummy_set_clock_mmss; /* */
mach_reset = dn_dummy_reset; /* */ mach_reset = dn_dummy_reset; /* */
#ifdef CONFIG_HEARTBEAT #ifdef CONFIG_HEARTBEAT
mach_heartbeat = dn_heartbeat; mach_heartbeat = dn_heartbeat;
...@@ -240,12 +238,6 @@ int dn_dummy_hwclk(int op, struct rtc_time *t) { ...@@ -240,12 +238,6 @@ int dn_dummy_hwclk(int op, struct rtc_time *t) {
} }
int dn_dummy_set_clock_mmss(unsigned long nowtime)
{
pr_info("set_clock_mmss\n");
return 0;
}
void dn_dummy_reset(void) { void dn_dummy_reset(void) {
dn_serial_print("The end !\n"); dn_serial_print("The end !\n");
......
...@@ -81,9 +81,6 @@ extern void atari_sched_init(irq_handler_t); ...@@ -81,9 +81,6 @@ extern void atari_sched_init(irq_handler_t);
extern u32 atari_gettimeoffset(void); extern u32 atari_gettimeoffset(void);
extern int atari_mste_hwclk (int, struct rtc_time *); extern int atari_mste_hwclk (int, struct rtc_time *);
extern int atari_tt_hwclk (int, struct rtc_time *); extern int atari_tt_hwclk (int, struct rtc_time *);
extern int atari_mste_set_clock_mmss (unsigned long);
extern int atari_tt_set_clock_mmss (unsigned long);
/* ++roman: This is a more elaborate test for an SCC chip, since the plain /* ++roman: This is a more elaborate test for an SCC chip, since the plain
* Medusa board generates DTACK at the SCC's standard addresses, but a SCC * Medusa board generates DTACK at the SCC's standard addresses, but a SCC
...@@ -362,13 +359,11 @@ void __init config_atari(void) ...@@ -362,13 +359,11 @@ void __init config_atari(void)
ATARIHW_SET(TT_CLK); ATARIHW_SET(TT_CLK);
pr_cont(" TT_CLK"); pr_cont(" TT_CLK");
mach_hwclk = atari_tt_hwclk; mach_hwclk = atari_tt_hwclk;
mach_set_clock_mmss = atari_tt_set_clock_mmss;
} }
if (hwreg_present(&mste_rtc.sec_ones)) { if (hwreg_present(&mste_rtc.sec_ones)) {
ATARIHW_SET(MSTE_CLK); ATARIHW_SET(MSTE_CLK);
pr_cont(" MSTE_CLK"); pr_cont(" MSTE_CLK");
mach_hwclk = atari_mste_hwclk; mach_hwclk = atari_mste_hwclk;
mach_set_clock_mmss = atari_mste_set_clock_mmss;
} }
if (!MACH_IS_MEDUSA && hwreg_present(&dma_wd.fdc_speed) && if (!MACH_IS_MEDUSA && hwreg_present(&dma_wd.fdc_speed) &&
hwreg_write(&dma_wd.fdc_speed, 0)) { hwreg_write(&dma_wd.fdc_speed, 0)) {
......
...@@ -285,69 +285,6 @@ int atari_tt_hwclk( int op, struct rtc_time *t ) ...@@ -285,69 +285,6 @@ int atari_tt_hwclk( int op, struct rtc_time *t )
return( 0 ); return( 0 );
} }
int atari_mste_set_clock_mmss (unsigned long nowtime)
{
short real_seconds = nowtime % 60, real_minutes = (nowtime / 60) % 60;
struct MSTE_RTC val;
unsigned char rtc_minutes;
mste_read(&val);
rtc_minutes= val.min_ones + val.min_tens * 10;
if ((rtc_minutes < real_minutes
? real_minutes - rtc_minutes
: rtc_minutes - real_minutes) < 30)
{
val.sec_ones = real_seconds % 10;
val.sec_tens = real_seconds / 10;
val.min_ones = real_minutes % 10;
val.min_tens = real_minutes / 10;
mste_write(&val);
}
else
return -1;
return 0;
}
int atari_tt_set_clock_mmss (unsigned long nowtime)
{
int retval = 0;
short real_seconds = nowtime % 60, real_minutes = (nowtime / 60) % 60;
unsigned char save_control, save_freq_select, rtc_minutes;
save_control = RTC_READ (RTC_CONTROL); /* tell the clock it's being set */
RTC_WRITE (RTC_CONTROL, save_control | RTC_SET);
save_freq_select = RTC_READ (RTC_FREQ_SELECT); /* stop and reset prescaler */
RTC_WRITE (RTC_FREQ_SELECT, save_freq_select | RTC_DIV_RESET2);
rtc_minutes = RTC_READ (RTC_MINUTES);
if (!(save_control & RTC_DM_BINARY))
rtc_minutes = bcd2bin(rtc_minutes);
/* Since we're only adjusting minutes and seconds, don't interfere
with hour overflow. This avoids messing with unknown time zones
but requires your RTC not to be off by more than 30 minutes. */
if ((rtc_minutes < real_minutes
? real_minutes - rtc_minutes
: rtc_minutes - real_minutes) < 30)
{
if (!(save_control & RTC_DM_BINARY))
{
real_seconds = bin2bcd(real_seconds);
real_minutes = bin2bcd(real_minutes);
}
RTC_WRITE (RTC_SECONDS, real_seconds);
RTC_WRITE (RTC_MINUTES, real_minutes);
}
else
retval = -1;
RTC_WRITE (RTC_FREQ_SELECT, save_freq_select);
RTC_WRITE (RTC_CONTROL, save_control);
return retval;
}
/* /*
* Local variables: * Local variables:
* c-indent-level: 4 * c-indent-level: 4
......
...@@ -41,7 +41,6 @@ static void bvme6000_get_model(char *model); ...@@ -41,7 +41,6 @@ static void bvme6000_get_model(char *model);
extern void bvme6000_sched_init(irq_handler_t handler); extern void bvme6000_sched_init(irq_handler_t handler);
extern u32 bvme6000_gettimeoffset(void); extern u32 bvme6000_gettimeoffset(void);
extern int bvme6000_hwclk (int, struct rtc_time *); extern int bvme6000_hwclk (int, struct rtc_time *);
extern int bvme6000_set_clock_mmss (unsigned long);
extern void bvme6000_reset (void); extern void bvme6000_reset (void);
void bvme6000_set_vectors (void); void bvme6000_set_vectors (void);
...@@ -113,7 +112,6 @@ void __init config_bvme6000(void) ...@@ -113,7 +112,6 @@ void __init config_bvme6000(void)
mach_init_IRQ = bvme6000_init_IRQ; mach_init_IRQ = bvme6000_init_IRQ;
arch_gettimeoffset = bvme6000_gettimeoffset; arch_gettimeoffset = bvme6000_gettimeoffset;
mach_hwclk = bvme6000_hwclk; mach_hwclk = bvme6000_hwclk;
mach_set_clock_mmss = bvme6000_set_clock_mmss;
mach_reset = bvme6000_reset; mach_reset = bvme6000_reset;
mach_get_model = bvme6000_get_model; mach_get_model = bvme6000_get_model;
...@@ -305,46 +303,3 @@ int bvme6000_hwclk(int op, struct rtc_time *t) ...@@ -305,46 +303,3 @@ int bvme6000_hwclk(int op, struct rtc_time *t)
return 0; return 0;
} }
/*
* Set the minutes and seconds from seconds value 'nowtime'. Fail if
* clock is out by > 30 minutes. Logic lifted from atari code.
* Algorithm is to wait for the 10ms register to change, and then to
* wait a short while, and then set it.
*/
int bvme6000_set_clock_mmss (unsigned long nowtime)
{
int retval = 0;
short real_seconds = nowtime % 60, real_minutes = (nowtime / 60) % 60;
unsigned char rtc_minutes, rtc_tenms;
volatile RtcPtr_t rtc = (RtcPtr_t)BVME_RTC_BASE;
unsigned char msr = rtc->msr & 0xc0;
unsigned long flags;
volatile int i;
rtc->msr = 0; /* Ensure clock accessible */
rtc_minutes = bcd2bin (rtc->bcd_min);
if ((rtc_minutes < real_minutes
? real_minutes - rtc_minutes
: rtc_minutes - real_minutes) < 30)
{
local_irq_save(flags);
rtc_tenms = rtc->bcd_tenms;
while (rtc_tenms == rtc->bcd_tenms)
;
for (i = 0; i < 1000; i++)
;
rtc->bcd_min = bin2bcd(real_minutes);
rtc->bcd_sec = bin2bcd(real_seconds);
local_irq_restore(flags);
}
else
retval = -1;
rtc->msr = msr;
return retval;
}
...@@ -52,6 +52,7 @@ CONFIG_UNIX_DIAG=m ...@@ -52,6 +52,7 @@ CONFIG_UNIX_DIAG=m
CONFIG_TLS=m CONFIG_TLS=m
CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_MIGRATE=y
CONFIG_NET_KEY=y CONFIG_NET_KEY=y
CONFIG_XDP_SOCKETS=y
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_PNP=y CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_DHCP=y
...@@ -98,18 +99,14 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -98,18 +99,14 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_RT=m
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m CONFIG_NFT_CT=m
CONFIG_NFT_FLOW_OFFLOAD=m CONFIG_NFT_FLOW_OFFLOAD=m
CONFIG_NFT_SET_RBTREE=m
CONFIG_NFT_SET_HASH=m
CONFIG_NFT_SET_BITMAP=m
CONFIG_NFT_COUNTER=m CONFIG_NFT_COUNTER=m
CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_LOG=m CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m CONFIG_NFT_LIMIT=m
CONFIG_NFT_MASQ=m CONFIG_NFT_MASQ=m
...@@ -122,6 +119,7 @@ CONFIG_NFT_REJECT=m ...@@ -122,6 +119,7 @@ CONFIG_NFT_REJECT=m
CONFIG_NFT_COMPAT=m CONFIG_NFT_COMPAT=m
CONFIG_NFT_HASH=m CONFIG_NFT_HASH=m
CONFIG_NFT_FIB_INET=m CONFIG_NFT_FIB_INET=m
CONFIG_NFT_SOCKET=m
CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m
CONFIG_NFT_FWD_NETDEV=m CONFIG_NFT_FWD_NETDEV=m
CONFIG_NFT_FIB_NETDEV=m CONFIG_NFT_FIB_NETDEV=m
...@@ -200,7 +198,6 @@ CONFIG_IP_SET_HASH_NETPORT=m ...@@ -200,7 +198,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_DUP_IPV4=m
CONFIG_NFT_FIB_IPV4=m CONFIG_NFT_FIB_IPV4=m
...@@ -231,7 +228,6 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -231,7 +228,6 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ_IPV6=m
...@@ -260,7 +256,6 @@ CONFIG_IP6_NF_NAT=m ...@@ -260,7 +256,6 @@ CONFIG_IP6_NF_NAT=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=y CONFIG_NF_TABLES_BRIDGE=y
CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NF_LOG_BRIDGE=m CONFIG_NF_LOG_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
...@@ -301,6 +296,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m ...@@ -301,6 +296,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
CONFIG_DNS_RESOLVER=y CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
# CONFIG_BATMAN_ADV_BATMAN_V is not set
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_NC=y
CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_MCAST=y
...@@ -356,6 +352,7 @@ CONFIG_A2091_SCSI=y ...@@ -356,6 +352,7 @@ CONFIG_A2091_SCSI=y
CONFIG_GVP11_SCSI=y CONFIG_GVP11_SCSI=y
CONFIG_SCSI_A4000T=y CONFIG_SCSI_A4000T=y
CONFIG_SCSI_ZORRO7XX=y CONFIG_SCSI_ZORRO7XX=y
CONFIG_SCSI_ZORRO_ESP=y
CONFIG_MD=y CONFIG_MD=y
CONFIG_MD_LINEAR=m CONFIG_MD_LINEAR=m
CONFIG_BLK_DEV_DM=m CONFIG_BLK_DEV_DM=m
...@@ -363,6 +360,7 @@ CONFIG_DM_UNSTRIPED=m ...@@ -363,6 +360,7 @@ CONFIG_DM_UNSTRIPED=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_THIN_PROVISIONING=m
CONFIG_DM_WRITECACHE=m
CONFIG_DM_ERA=m CONFIG_DM_ERA=m
CONFIG_DM_MIRROR=m CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m CONFIG_DM_RAID=m
...@@ -402,8 +400,8 @@ CONFIG_A2065=y ...@@ -402,8 +400,8 @@ CONFIG_A2065=y
CONFIG_ARIADNE=y CONFIG_ARIADNE=y
# CONFIG_NET_VENDOR_AQUANTIA is not set # CONFIG_NET_VENDOR_AQUANTIA is not set
# CONFIG_NET_VENDOR_ARC is not set # CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_CIRRUS is not set # CONFIG_NET_VENDOR_CIRRUS is not set
# CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_CORTINA is not set
# CONFIG_NET_VENDOR_EZCHIP is not set # CONFIG_NET_VENDOR_EZCHIP is not set
...@@ -412,8 +410,10 @@ CONFIG_ARIADNE=y ...@@ -412,8 +410,10 @@ CONFIG_ARIADNE=y
# CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_INTEL is not set
# CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MARVELL is not set
# CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROSEMI is not set
# CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NETRONOME is not set
# CONFIG_NET_VENDOR_NI is not set # CONFIG_NET_VENDOR_NI is not set
CONFIG_XSURF100=y
CONFIG_HYDRA=y CONFIG_HYDRA=y
CONFIG_APNE=y CONFIG_APNE=y
CONFIG_ZORRO8390=y CONFIG_ZORRO8390=y
...@@ -426,9 +426,9 @@ CONFIG_ZORRO8390=y ...@@ -426,9 +426,9 @@ CONFIG_ZORRO8390=y
# CONFIG_NET_VENDOR_SMSC is not set # CONFIG_NET_VENDOR_SMSC is not set
# CONFIG_NET_VENDOR_SOCIONEXT is not set # CONFIG_NET_VENDOR_SOCIONEXT is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -478,6 +478,7 @@ CONFIG_HIDRAW=y ...@@ -478,6 +478,7 @@ CONFIG_HIDRAW=y
CONFIG_UHID=m CONFIG_UHID=m
# CONFIG_HID_GENERIC is not set # CONFIG_HID_GENERIC is not set
# CONFIG_HID_ITE is not set # CONFIG_HID_ITE is not set
# CONFIG_HID_REDRAGON is not set
# CONFIG_USB_SUPPORT is not set # CONFIG_USB_SUPPORT is not set
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
...@@ -499,7 +500,7 @@ CONFIG_FS_ENCRYPTION=m ...@@ -499,7 +500,7 @@ CONFIG_FS_ENCRYPTION=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_PRINT_QUOTA_WARNING is not set # CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_AUTOFS4_FS=m CONFIG_AUTOFS_FS=m
CONFIG_FUSE_FS=m CONFIG_FUSE_FS=m
CONFIG_CUSE=m CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m CONFIG_OVERLAY_FS=m
...@@ -600,6 +601,7 @@ CONFIG_TEST_KSTRTOX=m ...@@ -600,6 +601,7 @@ CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_OVERFLOW=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -622,6 +624,11 @@ CONFIG_CRYPTO_CRYPTD=m ...@@ -622,6 +624,11 @@ CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_MCRYPTD=m CONFIG_CRYPTO_MCRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_AEGIS128=m
CONFIG_CRYPTO_AEGIS128L=m
CONFIG_CRYPTO_AEGIS256=m
CONFIG_CRYPTO_MORUS640=m
CONFIG_CRYPTO_MORUS1280=m
CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CFB=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
...@@ -657,6 +664,7 @@ CONFIG_CRYPTO_LZO=m ...@@ -657,6 +664,7 @@ CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_842=m CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4HC=m
CONFIG_CRYPTO_ZSTD=m
CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HASH=y
CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_CTR=y
......
...@@ -50,6 +50,7 @@ CONFIG_UNIX_DIAG=m ...@@ -50,6 +50,7 @@ CONFIG_UNIX_DIAG=m
CONFIG_TLS=m CONFIG_TLS=m
CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_MIGRATE=y
CONFIG_NET_KEY=y CONFIG_NET_KEY=y
CONFIG_XDP_SOCKETS=y
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_PNP=y CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_DHCP=y
...@@ -96,18 +97,14 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -96,18 +97,14 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_RT=m
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m CONFIG_NFT_CT=m
CONFIG_NFT_FLOW_OFFLOAD=m CONFIG_NFT_FLOW_OFFLOAD=m
CONFIG_NFT_SET_RBTREE=m
CONFIG_NFT_SET_HASH=m
CONFIG_NFT_SET_BITMAP=m
CONFIG_NFT_COUNTER=m CONFIG_NFT_COUNTER=m
CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_LOG=m CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m CONFIG_NFT_LIMIT=m
CONFIG_NFT_MASQ=m CONFIG_NFT_MASQ=m
...@@ -120,6 +117,7 @@ CONFIG_NFT_REJECT=m ...@@ -120,6 +117,7 @@ CONFIG_NFT_REJECT=m
CONFIG_NFT_COMPAT=m CONFIG_NFT_COMPAT=m
CONFIG_NFT_HASH=m CONFIG_NFT_HASH=m
CONFIG_NFT_FIB_INET=m CONFIG_NFT_FIB_INET=m
CONFIG_NFT_SOCKET=m
CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m
CONFIG_NFT_FWD_NETDEV=m CONFIG_NFT_FWD_NETDEV=m
CONFIG_NFT_FIB_NETDEV=m CONFIG_NFT_FIB_NETDEV=m
...@@ -198,7 +196,6 @@ CONFIG_IP_SET_HASH_NETPORT=m ...@@ -198,7 +196,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_DUP_IPV4=m
CONFIG_NFT_FIB_IPV4=m CONFIG_NFT_FIB_IPV4=m
...@@ -229,7 +226,6 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -229,7 +226,6 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ_IPV6=m
...@@ -258,7 +254,6 @@ CONFIG_IP6_NF_NAT=m ...@@ -258,7 +254,6 @@ CONFIG_IP6_NF_NAT=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=y CONFIG_NF_TABLES_BRIDGE=y
CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NF_LOG_BRIDGE=m CONFIG_NF_LOG_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
...@@ -299,6 +294,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m ...@@ -299,6 +294,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
CONFIG_DNS_RESOLVER=y CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
# CONFIG_BATMAN_ADV_BATMAN_V is not set
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_NC=y
CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_MCAST=y
...@@ -345,6 +341,7 @@ CONFIG_DM_UNSTRIPED=m ...@@ -345,6 +341,7 @@ CONFIG_DM_UNSTRIPED=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_THIN_PROVISIONING=m
CONFIG_DM_WRITECACHE=m
CONFIG_DM_ERA=m CONFIG_DM_ERA=m
CONFIG_DM_MIRROR=m CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m CONFIG_DM_RAID=m
...@@ -381,14 +378,15 @@ CONFIG_VETH=m ...@@ -381,14 +378,15 @@ CONFIG_VETH=m
# CONFIG_NET_VENDOR_AMAZON is not set # CONFIG_NET_VENDOR_AMAZON is not set
# CONFIG_NET_VENDOR_AQUANTIA is not set # CONFIG_NET_VENDOR_AQUANTIA is not set
# CONFIG_NET_VENDOR_ARC is not set # CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_CORTINA is not set
# CONFIG_NET_VENDOR_EZCHIP is not set # CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_HUAWEI is not set
# CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_INTEL is not set
# CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MARVELL is not set
# CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROSEMI is not set
# CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NATSEMI is not set
# CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NETRONOME is not set
# CONFIG_NET_VENDOR_NI is not set # CONFIG_NET_VENDOR_NI is not set
...@@ -400,9 +398,9 @@ CONFIG_VETH=m ...@@ -400,9 +398,9 @@ CONFIG_VETH=m
# CONFIG_NET_VENDOR_SOLARFLARE is not set # CONFIG_NET_VENDOR_SOLARFLARE is not set
# CONFIG_NET_VENDOR_SOCIONEXT is not set # CONFIG_NET_VENDOR_SOCIONEXT is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -440,6 +438,7 @@ CONFIG_HIDRAW=y ...@@ -440,6 +438,7 @@ CONFIG_HIDRAW=y
CONFIG_UHID=m CONFIG_UHID=m
# CONFIG_HID_GENERIC is not set # CONFIG_HID_GENERIC is not set
# CONFIG_HID_ITE is not set # CONFIG_HID_ITE is not set
# CONFIG_HID_REDRAGON is not set
# CONFIG_USB_SUPPORT is not set # CONFIG_USB_SUPPORT is not set
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
...@@ -458,7 +457,7 @@ CONFIG_FS_ENCRYPTION=m ...@@ -458,7 +457,7 @@ CONFIG_FS_ENCRYPTION=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_PRINT_QUOTA_WARNING is not set # CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_AUTOFS4_FS=m CONFIG_AUTOFS_FS=m
CONFIG_FUSE_FS=m CONFIG_FUSE_FS=m
CONFIG_CUSE=m CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m CONFIG_OVERLAY_FS=m
...@@ -559,6 +558,7 @@ CONFIG_TEST_KSTRTOX=m ...@@ -559,6 +558,7 @@ CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_OVERFLOW=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -581,6 +581,11 @@ CONFIG_CRYPTO_CRYPTD=m ...@@ -581,6 +581,11 @@ CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_MCRYPTD=m CONFIG_CRYPTO_MCRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_AEGIS128=m
CONFIG_CRYPTO_AEGIS128L=m
CONFIG_CRYPTO_AEGIS256=m
CONFIG_CRYPTO_MORUS640=m
CONFIG_CRYPTO_MORUS1280=m
CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CFB=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
...@@ -616,6 +621,7 @@ CONFIG_CRYPTO_LZO=m ...@@ -616,6 +621,7 @@ CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_842=m CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4HC=m
CONFIG_CRYPTO_ZSTD=m
CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HASH=y
CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_CTR=y
......
...@@ -50,6 +50,7 @@ CONFIG_UNIX_DIAG=m ...@@ -50,6 +50,7 @@ CONFIG_UNIX_DIAG=m
CONFIG_TLS=m CONFIG_TLS=m
CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_MIGRATE=y
CONFIG_NET_KEY=y CONFIG_NET_KEY=y
CONFIG_XDP_SOCKETS=y
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_PNP=y CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_DHCP=y
...@@ -96,18 +97,14 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -96,18 +97,14 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_RT=m
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m CONFIG_NFT_CT=m
CONFIG_NFT_FLOW_OFFLOAD=m CONFIG_NFT_FLOW_OFFLOAD=m
CONFIG_NFT_SET_RBTREE=m
CONFIG_NFT_SET_HASH=m
CONFIG_NFT_SET_BITMAP=m
CONFIG_NFT_COUNTER=m CONFIG_NFT_COUNTER=m
CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_LOG=m CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m CONFIG_NFT_LIMIT=m
CONFIG_NFT_MASQ=m CONFIG_NFT_MASQ=m
...@@ -120,6 +117,7 @@ CONFIG_NFT_REJECT=m ...@@ -120,6 +117,7 @@ CONFIG_NFT_REJECT=m
CONFIG_NFT_COMPAT=m CONFIG_NFT_COMPAT=m
CONFIG_NFT_HASH=m CONFIG_NFT_HASH=m
CONFIG_NFT_FIB_INET=m CONFIG_NFT_FIB_INET=m
CONFIG_NFT_SOCKET=m
CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m
CONFIG_NFT_FWD_NETDEV=m CONFIG_NFT_FWD_NETDEV=m
CONFIG_NFT_FIB_NETDEV=m CONFIG_NFT_FIB_NETDEV=m
...@@ -198,7 +196,6 @@ CONFIG_IP_SET_HASH_NETPORT=m ...@@ -198,7 +196,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_DUP_IPV4=m
CONFIG_NFT_FIB_IPV4=m CONFIG_NFT_FIB_IPV4=m
...@@ -229,7 +226,6 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -229,7 +226,6 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ_IPV6=m
...@@ -258,7 +254,6 @@ CONFIG_IP6_NF_NAT=m ...@@ -258,7 +254,6 @@ CONFIG_IP6_NF_NAT=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=y CONFIG_NF_TABLES_BRIDGE=y
CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NF_LOG_BRIDGE=m CONFIG_NF_LOG_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
...@@ -299,6 +294,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m ...@@ -299,6 +294,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
CONFIG_DNS_RESOLVER=y CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
# CONFIG_BATMAN_ADV_BATMAN_V is not set
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_NC=y
CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_MCAST=y
...@@ -354,6 +350,7 @@ CONFIG_DM_UNSTRIPED=m ...@@ -354,6 +350,7 @@ CONFIG_DM_UNSTRIPED=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_THIN_PROVISIONING=m
CONFIG_DM_WRITECACHE=m
CONFIG_DM_ERA=m CONFIG_DM_ERA=m
CONFIG_DM_MIRROR=m CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m CONFIG_DM_RAID=m
...@@ -391,14 +388,15 @@ CONFIG_VETH=m ...@@ -391,14 +388,15 @@ CONFIG_VETH=m
CONFIG_ATARILANCE=y CONFIG_ATARILANCE=y
# CONFIG_NET_VENDOR_AQUANTIA is not set # CONFIG_NET_VENDOR_AQUANTIA is not set
# CONFIG_NET_VENDOR_ARC is not set # CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_CORTINA is not set
# CONFIG_NET_VENDOR_EZCHIP is not set # CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_HUAWEI is not set
# CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_INTEL is not set
# CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MARVELL is not set
# CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROSEMI is not set
# CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NETRONOME is not set
# CONFIG_NET_VENDOR_NI is not set # CONFIG_NET_VENDOR_NI is not set
CONFIG_NE2000=y CONFIG_NE2000=y
...@@ -411,9 +409,9 @@ CONFIG_NE2000=y ...@@ -411,9 +409,9 @@ CONFIG_NE2000=y
CONFIG_SMC91X=y CONFIG_SMC91X=y
# CONFIG_NET_VENDOR_SOCIONEXT is not set # CONFIG_NET_VENDOR_SOCIONEXT is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -480,7 +478,7 @@ CONFIG_FS_ENCRYPTION=m ...@@ -480,7 +478,7 @@ CONFIG_FS_ENCRYPTION=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_PRINT_QUOTA_WARNING is not set # CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_AUTOFS4_FS=m CONFIG_AUTOFS_FS=m
CONFIG_FUSE_FS=m CONFIG_FUSE_FS=m
CONFIG_CUSE=m CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m CONFIG_OVERLAY_FS=m
...@@ -581,6 +579,7 @@ CONFIG_TEST_KSTRTOX=m ...@@ -581,6 +579,7 @@ CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_OVERFLOW=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -603,6 +602,11 @@ CONFIG_CRYPTO_CRYPTD=m ...@@ -603,6 +602,11 @@ CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_MCRYPTD=m CONFIG_CRYPTO_MCRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_AEGIS128=m
CONFIG_CRYPTO_AEGIS128L=m
CONFIG_CRYPTO_AEGIS256=m
CONFIG_CRYPTO_MORUS640=m
CONFIG_CRYPTO_MORUS1280=m
CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CFB=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
...@@ -638,6 +642,7 @@ CONFIG_CRYPTO_LZO=m ...@@ -638,6 +642,7 @@ CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_842=m CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4HC=m
CONFIG_CRYPTO_ZSTD=m
CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HASH=y
CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_CTR=y
......
...@@ -48,6 +48,7 @@ CONFIG_UNIX_DIAG=m ...@@ -48,6 +48,7 @@ CONFIG_UNIX_DIAG=m
CONFIG_TLS=m CONFIG_TLS=m
CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_MIGRATE=y
CONFIG_NET_KEY=y CONFIG_NET_KEY=y
CONFIG_XDP_SOCKETS=y
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_PNP=y CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_DHCP=y
...@@ -94,18 +95,14 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -94,18 +95,14 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_RT=m
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m CONFIG_NFT_CT=m
CONFIG_NFT_FLOW_OFFLOAD=m CONFIG_NFT_FLOW_OFFLOAD=m
CONFIG_NFT_SET_RBTREE=m
CONFIG_NFT_SET_HASH=m
CONFIG_NFT_SET_BITMAP=m
CONFIG_NFT_COUNTER=m CONFIG_NFT_COUNTER=m
CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_LOG=m CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m CONFIG_NFT_LIMIT=m
CONFIG_NFT_MASQ=m CONFIG_NFT_MASQ=m
...@@ -118,6 +115,7 @@ CONFIG_NFT_REJECT=m ...@@ -118,6 +115,7 @@ CONFIG_NFT_REJECT=m
CONFIG_NFT_COMPAT=m CONFIG_NFT_COMPAT=m
CONFIG_NFT_HASH=m CONFIG_NFT_HASH=m
CONFIG_NFT_FIB_INET=m CONFIG_NFT_FIB_INET=m
CONFIG_NFT_SOCKET=m
CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m
CONFIG_NFT_FWD_NETDEV=m CONFIG_NFT_FWD_NETDEV=m
CONFIG_NFT_FIB_NETDEV=m CONFIG_NFT_FIB_NETDEV=m
...@@ -196,7 +194,6 @@ CONFIG_IP_SET_HASH_NETPORT=m ...@@ -196,7 +194,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_DUP_IPV4=m
CONFIG_NFT_FIB_IPV4=m CONFIG_NFT_FIB_IPV4=m
...@@ -227,7 +224,6 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -227,7 +224,6 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ_IPV6=m
...@@ -256,7 +252,6 @@ CONFIG_IP6_NF_NAT=m ...@@ -256,7 +252,6 @@ CONFIG_IP6_NF_NAT=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=y CONFIG_NF_TABLES_BRIDGE=y
CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NF_LOG_BRIDGE=m CONFIG_NF_LOG_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
...@@ -297,6 +292,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m ...@@ -297,6 +292,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
CONFIG_DNS_RESOLVER=y CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
# CONFIG_BATMAN_ADV_BATMAN_V is not set
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_NC=y
CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_MCAST=y
...@@ -344,6 +340,7 @@ CONFIG_DM_UNSTRIPED=m ...@@ -344,6 +340,7 @@ CONFIG_DM_UNSTRIPED=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_THIN_PROVISIONING=m
CONFIG_DM_WRITECACHE=m
CONFIG_DM_ERA=m CONFIG_DM_ERA=m
CONFIG_DM_MIRROR=m CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m CONFIG_DM_RAID=m
...@@ -380,14 +377,15 @@ CONFIG_VETH=m ...@@ -380,14 +377,15 @@ CONFIG_VETH=m
# CONFIG_NET_VENDOR_AMAZON is not set # CONFIG_NET_VENDOR_AMAZON is not set
# CONFIG_NET_VENDOR_AQUANTIA is not set # CONFIG_NET_VENDOR_AQUANTIA is not set
# CONFIG_NET_VENDOR_ARC is not set # CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_CORTINA is not set
# CONFIG_NET_VENDOR_EZCHIP is not set # CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_HUAWEI is not set
CONFIG_BVME6000_NET=y CONFIG_BVME6000_NET=y
# CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MARVELL is not set
# CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROSEMI is not set
# CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NATSEMI is not set
# CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NETRONOME is not set
# CONFIG_NET_VENDOR_NI is not set # CONFIG_NET_VENDOR_NI is not set
...@@ -399,9 +397,9 @@ CONFIG_BVME6000_NET=y ...@@ -399,9 +397,9 @@ CONFIG_BVME6000_NET=y
# CONFIG_NET_VENDOR_SOLARFLARE is not set # CONFIG_NET_VENDOR_SOLARFLARE is not set
# CONFIG_NET_VENDOR_SOCIONEXT is not set # CONFIG_NET_VENDOR_SOCIONEXT is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -433,6 +431,7 @@ CONFIG_HIDRAW=y ...@@ -433,6 +431,7 @@ CONFIG_HIDRAW=y
CONFIG_UHID=m CONFIG_UHID=m
# CONFIG_HID_GENERIC is not set # CONFIG_HID_GENERIC is not set
# CONFIG_HID_ITE is not set # CONFIG_HID_ITE is not set
# CONFIG_HID_REDRAGON is not set
# CONFIG_USB_SUPPORT is not set # CONFIG_USB_SUPPORT is not set
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
...@@ -450,7 +449,7 @@ CONFIG_FS_ENCRYPTION=m ...@@ -450,7 +449,7 @@ CONFIG_FS_ENCRYPTION=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_PRINT_QUOTA_WARNING is not set # CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_AUTOFS4_FS=m CONFIG_AUTOFS_FS=m
CONFIG_FUSE_FS=m CONFIG_FUSE_FS=m
CONFIG_CUSE=m CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m CONFIG_OVERLAY_FS=m
...@@ -551,6 +550,7 @@ CONFIG_TEST_KSTRTOX=m ...@@ -551,6 +550,7 @@ CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_OVERFLOW=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -573,6 +573,11 @@ CONFIG_CRYPTO_CRYPTD=m ...@@ -573,6 +573,11 @@ CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_MCRYPTD=m CONFIG_CRYPTO_MCRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_AEGIS128=m
CONFIG_CRYPTO_AEGIS128L=m
CONFIG_CRYPTO_AEGIS256=m
CONFIG_CRYPTO_MORUS640=m
CONFIG_CRYPTO_MORUS1280=m
CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CFB=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
...@@ -608,6 +613,7 @@ CONFIG_CRYPTO_LZO=m ...@@ -608,6 +613,7 @@ CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_842=m CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4HC=m
CONFIG_CRYPTO_ZSTD=m
CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HASH=y
CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_CTR=y
......
...@@ -50,6 +50,7 @@ CONFIG_UNIX_DIAG=m ...@@ -50,6 +50,7 @@ CONFIG_UNIX_DIAG=m
CONFIG_TLS=m CONFIG_TLS=m
CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_MIGRATE=y
CONFIG_NET_KEY=y CONFIG_NET_KEY=y
CONFIG_XDP_SOCKETS=y
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_PNP=y CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_DHCP=y
...@@ -96,18 +97,14 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -96,18 +97,14 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_RT=m
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m CONFIG_NFT_CT=m
CONFIG_NFT_FLOW_OFFLOAD=m CONFIG_NFT_FLOW_OFFLOAD=m
CONFIG_NFT_SET_RBTREE=m
CONFIG_NFT_SET_HASH=m
CONFIG_NFT_SET_BITMAP=m
CONFIG_NFT_COUNTER=m CONFIG_NFT_COUNTER=m
CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_LOG=m CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m CONFIG_NFT_LIMIT=m
CONFIG_NFT_MASQ=m CONFIG_NFT_MASQ=m
...@@ -120,6 +117,7 @@ CONFIG_NFT_REJECT=m ...@@ -120,6 +117,7 @@ CONFIG_NFT_REJECT=m
CONFIG_NFT_COMPAT=m CONFIG_NFT_COMPAT=m
CONFIG_NFT_HASH=m CONFIG_NFT_HASH=m
CONFIG_NFT_FIB_INET=m CONFIG_NFT_FIB_INET=m
CONFIG_NFT_SOCKET=m
CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m
CONFIG_NFT_FWD_NETDEV=m CONFIG_NFT_FWD_NETDEV=m
CONFIG_NFT_FIB_NETDEV=m CONFIG_NFT_FIB_NETDEV=m
...@@ -198,7 +196,6 @@ CONFIG_IP_SET_HASH_NETPORT=m ...@@ -198,7 +196,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_DUP_IPV4=m
CONFIG_NFT_FIB_IPV4=m CONFIG_NFT_FIB_IPV4=m
...@@ -229,7 +226,6 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -229,7 +226,6 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ_IPV6=m
...@@ -258,7 +254,6 @@ CONFIG_IP6_NF_NAT=m ...@@ -258,7 +254,6 @@ CONFIG_IP6_NF_NAT=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=y CONFIG_NF_TABLES_BRIDGE=y
CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NF_LOG_BRIDGE=m CONFIG_NF_LOG_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
...@@ -299,6 +294,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m ...@@ -299,6 +294,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
CONFIG_DNS_RESOLVER=y CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
# CONFIG_BATMAN_ADV_BATMAN_V is not set
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_NC=y
CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_MCAST=y
...@@ -345,6 +341,7 @@ CONFIG_DM_UNSTRIPED=m ...@@ -345,6 +341,7 @@ CONFIG_DM_UNSTRIPED=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_THIN_PROVISIONING=m
CONFIG_DM_WRITECACHE=m
CONFIG_DM_ERA=m CONFIG_DM_ERA=m
CONFIG_DM_MIRROR=m CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m CONFIG_DM_RAID=m
...@@ -382,14 +379,15 @@ CONFIG_VETH=m ...@@ -382,14 +379,15 @@ CONFIG_VETH=m
CONFIG_HPLANCE=y CONFIG_HPLANCE=y
# CONFIG_NET_VENDOR_AQUANTIA is not set # CONFIG_NET_VENDOR_AQUANTIA is not set
# CONFIG_NET_VENDOR_ARC is not set # CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_CORTINA is not set
# CONFIG_NET_VENDOR_EZCHIP is not set # CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_HUAWEI is not set
# CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_INTEL is not set
# CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MARVELL is not set
# CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROSEMI is not set
# CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NATSEMI is not set
# CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NETRONOME is not set
# CONFIG_NET_VENDOR_NI is not set # CONFIG_NET_VENDOR_NI is not set
...@@ -401,9 +399,9 @@ CONFIG_HPLANCE=y ...@@ -401,9 +399,9 @@ CONFIG_HPLANCE=y
# CONFIG_NET_VENDOR_SOLARFLARE is not set # CONFIG_NET_VENDOR_SOLARFLARE is not set
# CONFIG_NET_VENDOR_SOCIONEXT is not set # CONFIG_NET_VENDOR_SOCIONEXT is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -443,6 +441,7 @@ CONFIG_HIDRAW=y ...@@ -443,6 +441,7 @@ CONFIG_HIDRAW=y
CONFIG_UHID=m CONFIG_UHID=m
# CONFIG_HID_GENERIC is not set # CONFIG_HID_GENERIC is not set
# CONFIG_HID_ITE is not set # CONFIG_HID_ITE is not set
# CONFIG_HID_REDRAGON is not set
# CONFIG_USB_SUPPORT is not set # CONFIG_USB_SUPPORT is not set
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
...@@ -460,7 +459,7 @@ CONFIG_FS_ENCRYPTION=m ...@@ -460,7 +459,7 @@ CONFIG_FS_ENCRYPTION=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_PRINT_QUOTA_WARNING is not set # CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_AUTOFS4_FS=m CONFIG_AUTOFS_FS=m
CONFIG_FUSE_FS=m CONFIG_FUSE_FS=m
CONFIG_CUSE=m CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m CONFIG_OVERLAY_FS=m
...@@ -561,6 +560,7 @@ CONFIG_TEST_KSTRTOX=m ...@@ -561,6 +560,7 @@ CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_OVERFLOW=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -583,6 +583,11 @@ CONFIG_CRYPTO_CRYPTD=m ...@@ -583,6 +583,11 @@ CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_MCRYPTD=m CONFIG_CRYPTO_MCRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_AEGIS128=m
CONFIG_CRYPTO_AEGIS128L=m
CONFIG_CRYPTO_AEGIS256=m
CONFIG_CRYPTO_MORUS640=m
CONFIG_CRYPTO_MORUS1280=m
CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CFB=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
...@@ -618,6 +623,7 @@ CONFIG_CRYPTO_LZO=m ...@@ -618,6 +623,7 @@ CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_842=m CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4HC=m
CONFIG_CRYPTO_ZSTD=m
CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HASH=y
CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_CTR=y
......
...@@ -49,6 +49,7 @@ CONFIG_UNIX_DIAG=m ...@@ -49,6 +49,7 @@ CONFIG_UNIX_DIAG=m
CONFIG_TLS=m CONFIG_TLS=m
CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_MIGRATE=y
CONFIG_NET_KEY=y CONFIG_NET_KEY=y
CONFIG_XDP_SOCKETS=y
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_PNP=y CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_DHCP=y
...@@ -95,18 +96,14 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -95,18 +96,14 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_RT=m
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m CONFIG_NFT_CT=m
CONFIG_NFT_FLOW_OFFLOAD=m CONFIG_NFT_FLOW_OFFLOAD=m
CONFIG_NFT_SET_RBTREE=m
CONFIG_NFT_SET_HASH=m
CONFIG_NFT_SET_BITMAP=m
CONFIG_NFT_COUNTER=m CONFIG_NFT_COUNTER=m
CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_LOG=m CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m CONFIG_NFT_LIMIT=m
CONFIG_NFT_MASQ=m CONFIG_NFT_MASQ=m
...@@ -119,6 +116,7 @@ CONFIG_NFT_REJECT=m ...@@ -119,6 +116,7 @@ CONFIG_NFT_REJECT=m
CONFIG_NFT_COMPAT=m CONFIG_NFT_COMPAT=m
CONFIG_NFT_HASH=m CONFIG_NFT_HASH=m
CONFIG_NFT_FIB_INET=m CONFIG_NFT_FIB_INET=m
CONFIG_NFT_SOCKET=m
CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m
CONFIG_NFT_FWD_NETDEV=m CONFIG_NFT_FWD_NETDEV=m
CONFIG_NFT_FIB_NETDEV=m CONFIG_NFT_FIB_NETDEV=m
...@@ -197,7 +195,6 @@ CONFIG_IP_SET_HASH_NETPORT=m ...@@ -197,7 +195,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_DUP_IPV4=m
CONFIG_NFT_FIB_IPV4=m CONFIG_NFT_FIB_IPV4=m
...@@ -228,7 +225,6 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -228,7 +225,6 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ_IPV6=m
...@@ -257,7 +253,6 @@ CONFIG_IP6_NF_NAT=m ...@@ -257,7 +253,6 @@ CONFIG_IP6_NF_NAT=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=y CONFIG_NF_TABLES_BRIDGE=y
CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NF_LOG_BRIDGE=m CONFIG_NF_LOG_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
...@@ -301,6 +296,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m ...@@ -301,6 +296,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
CONFIG_DNS_RESOLVER=y CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
# CONFIG_BATMAN_ADV_BATMAN_V is not set
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_NC=y
CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_MCAST=y
...@@ -354,6 +350,7 @@ CONFIG_DM_UNSTRIPED=m ...@@ -354,6 +350,7 @@ CONFIG_DM_UNSTRIPED=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_THIN_PROVISIONING=m
CONFIG_DM_WRITECACHE=m
CONFIG_DM_ERA=m CONFIG_DM_ERA=m
CONFIG_DM_MIRROR=m CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m CONFIG_DM_RAID=m
...@@ -398,8 +395,8 @@ CONFIG_VETH=m ...@@ -398,8 +395,8 @@ CONFIG_VETH=m
CONFIG_MACMACE=y CONFIG_MACMACE=y
# CONFIG_NET_VENDOR_AQUANTIA is not set # CONFIG_NET_VENDOR_AQUANTIA is not set
# CONFIG_NET_VENDOR_ARC is not set # CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_CADENCE is not set
CONFIG_MAC89x0=y CONFIG_MAC89x0=y
# CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_CORTINA is not set
# CONFIG_NET_VENDOR_EZCHIP is not set # CONFIG_NET_VENDOR_EZCHIP is not set
...@@ -407,6 +404,7 @@ CONFIG_MAC89x0=y ...@@ -407,6 +404,7 @@ CONFIG_MAC89x0=y
# CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_INTEL is not set
# CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MARVELL is not set
# CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROSEMI is not set
CONFIG_MACSONIC=y CONFIG_MACSONIC=y
# CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NETRONOME is not set
# CONFIG_NET_VENDOR_NI is not set # CONFIG_NET_VENDOR_NI is not set
...@@ -420,9 +418,9 @@ CONFIG_MAC8390=y ...@@ -420,9 +418,9 @@ CONFIG_MAC8390=y
# CONFIG_NET_VENDOR_SMSC is not set # CONFIG_NET_VENDOR_SMSC is not set
# CONFIG_NET_VENDOR_SOCIONEXT is not set # CONFIG_NET_VENDOR_SOCIONEXT is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -465,6 +463,7 @@ CONFIG_HIDRAW=y ...@@ -465,6 +463,7 @@ CONFIG_HIDRAW=y
CONFIG_UHID=m CONFIG_UHID=m
# CONFIG_HID_GENERIC is not set # CONFIG_HID_GENERIC is not set
# CONFIG_HID_ITE is not set # CONFIG_HID_ITE is not set
# CONFIG_HID_REDRAGON is not set
# CONFIG_USB_SUPPORT is not set # CONFIG_USB_SUPPORT is not set
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
...@@ -482,7 +481,7 @@ CONFIG_FS_ENCRYPTION=m ...@@ -482,7 +481,7 @@ CONFIG_FS_ENCRYPTION=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_PRINT_QUOTA_WARNING is not set # CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_AUTOFS4_FS=m CONFIG_AUTOFS_FS=m
CONFIG_FUSE_FS=m CONFIG_FUSE_FS=m
CONFIG_CUSE=m CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m CONFIG_OVERLAY_FS=m
...@@ -583,6 +582,7 @@ CONFIG_TEST_KSTRTOX=m ...@@ -583,6 +582,7 @@ CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_OVERFLOW=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -605,6 +605,11 @@ CONFIG_CRYPTO_CRYPTD=m ...@@ -605,6 +605,11 @@ CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_MCRYPTD=m CONFIG_CRYPTO_MCRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_AEGIS128=m
CONFIG_CRYPTO_AEGIS128L=m
CONFIG_CRYPTO_AEGIS256=m
CONFIG_CRYPTO_MORUS640=m
CONFIG_CRYPTO_MORUS1280=m
CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CFB=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
...@@ -640,6 +645,7 @@ CONFIG_CRYPTO_LZO=m ...@@ -640,6 +645,7 @@ CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_842=m CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4HC=m
CONFIG_CRYPTO_ZSTD=m
CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HASH=y
CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_CTR=y
......
...@@ -59,6 +59,7 @@ CONFIG_UNIX_DIAG=m ...@@ -59,6 +59,7 @@ CONFIG_UNIX_DIAG=m
CONFIG_TLS=m CONFIG_TLS=m
CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_MIGRATE=y
CONFIG_NET_KEY=y CONFIG_NET_KEY=y
CONFIG_XDP_SOCKETS=y
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_PNP=y CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_DHCP=y
...@@ -105,18 +106,14 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -105,18 +106,14 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_RT=m
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m CONFIG_NFT_CT=m
CONFIG_NFT_FLOW_OFFLOAD=m CONFIG_NFT_FLOW_OFFLOAD=m
CONFIG_NFT_SET_RBTREE=m
CONFIG_NFT_SET_HASH=m
CONFIG_NFT_SET_BITMAP=m
CONFIG_NFT_COUNTER=m CONFIG_NFT_COUNTER=m
CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_LOG=m CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m CONFIG_NFT_LIMIT=m
CONFIG_NFT_MASQ=m CONFIG_NFT_MASQ=m
...@@ -129,6 +126,7 @@ CONFIG_NFT_REJECT=m ...@@ -129,6 +126,7 @@ CONFIG_NFT_REJECT=m
CONFIG_NFT_COMPAT=m CONFIG_NFT_COMPAT=m
CONFIG_NFT_HASH=m CONFIG_NFT_HASH=m
CONFIG_NFT_FIB_INET=m CONFIG_NFT_FIB_INET=m
CONFIG_NFT_SOCKET=m
CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m
CONFIG_NFT_FWD_NETDEV=m CONFIG_NFT_FWD_NETDEV=m
CONFIG_NFT_FIB_NETDEV=m CONFIG_NFT_FIB_NETDEV=m
...@@ -207,7 +205,6 @@ CONFIG_IP_SET_HASH_NETPORT=m ...@@ -207,7 +205,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_DUP_IPV4=m
CONFIG_NFT_FIB_IPV4=m CONFIG_NFT_FIB_IPV4=m
...@@ -238,7 +235,6 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -238,7 +235,6 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ_IPV6=m
...@@ -267,7 +263,6 @@ CONFIG_IP6_NF_NAT=m ...@@ -267,7 +263,6 @@ CONFIG_IP6_NF_NAT=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=y CONFIG_NF_TABLES_BRIDGE=y
CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NF_LOG_BRIDGE=m CONFIG_NF_LOG_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
...@@ -311,6 +306,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m ...@@ -311,6 +306,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
CONFIG_DNS_RESOLVER=y CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
# CONFIG_BATMAN_ADV_BATMAN_V is not set
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_NC=y
CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_MCAST=y
...@@ -373,6 +369,7 @@ CONFIG_A2091_SCSI=y ...@@ -373,6 +369,7 @@ CONFIG_A2091_SCSI=y
CONFIG_GVP11_SCSI=y CONFIG_GVP11_SCSI=y
CONFIG_SCSI_A4000T=y CONFIG_SCSI_A4000T=y
CONFIG_SCSI_ZORRO7XX=y CONFIG_SCSI_ZORRO7XX=y
CONFIG_SCSI_ZORRO_ESP=y
CONFIG_ATARI_SCSI=y CONFIG_ATARI_SCSI=y
CONFIG_MAC_SCSI=y CONFIG_MAC_SCSI=y
CONFIG_SCSI_MAC_ESP=y CONFIG_SCSI_MAC_ESP=y
...@@ -387,6 +384,7 @@ CONFIG_DM_UNSTRIPED=m ...@@ -387,6 +384,7 @@ CONFIG_DM_UNSTRIPED=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_THIN_PROVISIONING=m
CONFIG_DM_WRITECACHE=m
CONFIG_DM_ERA=m CONFIG_DM_ERA=m
CONFIG_DM_MIRROR=m CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m CONFIG_DM_RAID=m
...@@ -438,8 +436,8 @@ CONFIG_SUN3LANCE=y ...@@ -438,8 +436,8 @@ CONFIG_SUN3LANCE=y
CONFIG_MACMACE=y CONFIG_MACMACE=y
# CONFIG_NET_VENDOR_AQUANTIA is not set # CONFIG_NET_VENDOR_AQUANTIA is not set
# CONFIG_NET_VENDOR_ARC is not set # CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_CADENCE is not set
CONFIG_MAC89x0=y CONFIG_MAC89x0=y
# CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_CORTINA is not set
# CONFIG_NET_VENDOR_EZCHIP is not set # CONFIG_NET_VENDOR_EZCHIP is not set
...@@ -449,9 +447,11 @@ CONFIG_BVME6000_NET=y ...@@ -449,9 +447,11 @@ CONFIG_BVME6000_NET=y
CONFIG_MVME16x_NET=y CONFIG_MVME16x_NET=y
# CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MARVELL is not set
# CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROSEMI is not set
CONFIG_MACSONIC=y CONFIG_MACSONIC=y
# CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NETRONOME is not set
# CONFIG_NET_VENDOR_NI is not set # CONFIG_NET_VENDOR_NI is not set
CONFIG_XSURF100=y
CONFIG_HYDRA=y CONFIG_HYDRA=y
CONFIG_MAC8390=y CONFIG_MAC8390=y
CONFIG_NE2000=y CONFIG_NE2000=y
...@@ -466,9 +466,9 @@ CONFIG_ZORRO8390=y ...@@ -466,9 +466,9 @@ CONFIG_ZORRO8390=y
CONFIG_SMC91X=y CONFIG_SMC91X=y
# CONFIG_NET_VENDOR_SOCIONEXT is not set # CONFIG_NET_VENDOR_SOCIONEXT is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PLIP=m CONFIG_PLIP=m
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
...@@ -533,6 +533,7 @@ CONFIG_HIDRAW=y ...@@ -533,6 +533,7 @@ CONFIG_HIDRAW=y
CONFIG_UHID=m CONFIG_UHID=m
# CONFIG_HID_GENERIC is not set # CONFIG_HID_GENERIC is not set
# CONFIG_HID_ITE is not set # CONFIG_HID_ITE is not set
# CONFIG_HID_REDRAGON is not set
# CONFIG_USB_SUPPORT is not set # CONFIG_USB_SUPPORT is not set
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
...@@ -562,7 +563,7 @@ CONFIG_FS_ENCRYPTION=m ...@@ -562,7 +563,7 @@ CONFIG_FS_ENCRYPTION=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_PRINT_QUOTA_WARNING is not set # CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_AUTOFS4_FS=m CONFIG_AUTOFS_FS=m
CONFIG_FUSE_FS=m CONFIG_FUSE_FS=m
CONFIG_CUSE=m CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m CONFIG_OVERLAY_FS=m
...@@ -663,6 +664,7 @@ CONFIG_TEST_KSTRTOX=m ...@@ -663,6 +664,7 @@ CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_OVERFLOW=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -685,6 +687,11 @@ CONFIG_CRYPTO_CRYPTD=m ...@@ -685,6 +687,11 @@ CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_MCRYPTD=m CONFIG_CRYPTO_MCRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_AEGIS128=m
CONFIG_CRYPTO_AEGIS128L=m
CONFIG_CRYPTO_AEGIS256=m
CONFIG_CRYPTO_MORUS640=m
CONFIG_CRYPTO_MORUS1280=m
CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CFB=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
...@@ -720,6 +727,7 @@ CONFIG_CRYPTO_LZO=m ...@@ -720,6 +727,7 @@ CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_842=m CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4HC=m
CONFIG_CRYPTO_ZSTD=m
CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HASH=y
CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_CTR=y
......
...@@ -47,6 +47,7 @@ CONFIG_UNIX_DIAG=m ...@@ -47,6 +47,7 @@ CONFIG_UNIX_DIAG=m
CONFIG_TLS=m CONFIG_TLS=m
CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_MIGRATE=y
CONFIG_NET_KEY=y CONFIG_NET_KEY=y
CONFIG_XDP_SOCKETS=y
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_PNP=y CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_DHCP=y
...@@ -93,18 +94,14 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -93,18 +94,14 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_RT=m
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m CONFIG_NFT_CT=m
CONFIG_NFT_FLOW_OFFLOAD=m CONFIG_NFT_FLOW_OFFLOAD=m
CONFIG_NFT_SET_RBTREE=m
CONFIG_NFT_SET_HASH=m
CONFIG_NFT_SET_BITMAP=m
CONFIG_NFT_COUNTER=m CONFIG_NFT_COUNTER=m
CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_LOG=m CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m CONFIG_NFT_LIMIT=m
CONFIG_NFT_MASQ=m CONFIG_NFT_MASQ=m
...@@ -117,6 +114,7 @@ CONFIG_NFT_REJECT=m ...@@ -117,6 +114,7 @@ CONFIG_NFT_REJECT=m
CONFIG_NFT_COMPAT=m CONFIG_NFT_COMPAT=m
CONFIG_NFT_HASH=m CONFIG_NFT_HASH=m
CONFIG_NFT_FIB_INET=m CONFIG_NFT_FIB_INET=m
CONFIG_NFT_SOCKET=m
CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m
CONFIG_NFT_FWD_NETDEV=m CONFIG_NFT_FWD_NETDEV=m
CONFIG_NFT_FIB_NETDEV=m CONFIG_NFT_FIB_NETDEV=m
...@@ -195,7 +193,6 @@ CONFIG_IP_SET_HASH_NETPORT=m ...@@ -195,7 +193,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_DUP_IPV4=m
CONFIG_NFT_FIB_IPV4=m CONFIG_NFT_FIB_IPV4=m
...@@ -226,7 +223,6 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -226,7 +223,6 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ_IPV6=m
...@@ -255,7 +251,6 @@ CONFIG_IP6_NF_NAT=m ...@@ -255,7 +251,6 @@ CONFIG_IP6_NF_NAT=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=y CONFIG_NF_TABLES_BRIDGE=y
CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NF_LOG_BRIDGE=m CONFIG_NF_LOG_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
...@@ -296,6 +291,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m ...@@ -296,6 +291,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
CONFIG_DNS_RESOLVER=y CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
# CONFIG_BATMAN_ADV_BATMAN_V is not set
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_NC=y
CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_MCAST=y
...@@ -343,6 +339,7 @@ CONFIG_DM_UNSTRIPED=m ...@@ -343,6 +339,7 @@ CONFIG_DM_UNSTRIPED=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_THIN_PROVISIONING=m
CONFIG_DM_WRITECACHE=m
CONFIG_DM_ERA=m CONFIG_DM_ERA=m
CONFIG_DM_MIRROR=m CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m CONFIG_DM_RAID=m
...@@ -380,14 +377,15 @@ CONFIG_VETH=m ...@@ -380,14 +377,15 @@ CONFIG_VETH=m
CONFIG_MVME147_NET=y CONFIG_MVME147_NET=y
# CONFIG_NET_VENDOR_AQUANTIA is not set # CONFIG_NET_VENDOR_AQUANTIA is not set
# CONFIG_NET_VENDOR_ARC is not set # CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_CORTINA is not set
# CONFIG_NET_VENDOR_EZCHIP is not set # CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_HUAWEI is not set
# CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_INTEL is not set
# CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MARVELL is not set
# CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROSEMI is not set
# CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NATSEMI is not set
# CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NETRONOME is not set
# CONFIG_NET_VENDOR_NI is not set # CONFIG_NET_VENDOR_NI is not set
...@@ -399,9 +397,9 @@ CONFIG_MVME147_NET=y ...@@ -399,9 +397,9 @@ CONFIG_MVME147_NET=y
# CONFIG_NET_VENDOR_SOLARFLARE is not set # CONFIG_NET_VENDOR_SOLARFLARE is not set
# CONFIG_NET_VENDOR_SOCIONEXT is not set # CONFIG_NET_VENDOR_SOCIONEXT is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -433,6 +431,7 @@ CONFIG_HIDRAW=y ...@@ -433,6 +431,7 @@ CONFIG_HIDRAW=y
CONFIG_UHID=m CONFIG_UHID=m
# CONFIG_HID_GENERIC is not set # CONFIG_HID_GENERIC is not set
# CONFIG_HID_ITE is not set # CONFIG_HID_ITE is not set
# CONFIG_HID_REDRAGON is not set
# CONFIG_USB_SUPPORT is not set # CONFIG_USB_SUPPORT is not set
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
...@@ -450,7 +449,7 @@ CONFIG_FS_ENCRYPTION=m ...@@ -450,7 +449,7 @@ CONFIG_FS_ENCRYPTION=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_PRINT_QUOTA_WARNING is not set # CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_AUTOFS4_FS=m CONFIG_AUTOFS_FS=m
CONFIG_FUSE_FS=m CONFIG_FUSE_FS=m
CONFIG_CUSE=m CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m CONFIG_OVERLAY_FS=m
...@@ -551,6 +550,7 @@ CONFIG_TEST_KSTRTOX=m ...@@ -551,6 +550,7 @@ CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_OVERFLOW=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -573,6 +573,11 @@ CONFIG_CRYPTO_CRYPTD=m ...@@ -573,6 +573,11 @@ CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_MCRYPTD=m CONFIG_CRYPTO_MCRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_AEGIS128=m
CONFIG_CRYPTO_AEGIS128L=m
CONFIG_CRYPTO_AEGIS256=m
CONFIG_CRYPTO_MORUS640=m
CONFIG_CRYPTO_MORUS1280=m
CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CFB=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
...@@ -608,6 +613,7 @@ CONFIG_CRYPTO_LZO=m ...@@ -608,6 +613,7 @@ CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_842=m CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4HC=m
CONFIG_CRYPTO_ZSTD=m
CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HASH=y
CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_CTR=y
......
...@@ -48,6 +48,7 @@ CONFIG_UNIX_DIAG=m ...@@ -48,6 +48,7 @@ CONFIG_UNIX_DIAG=m
CONFIG_TLS=m CONFIG_TLS=m
CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_MIGRATE=y
CONFIG_NET_KEY=y CONFIG_NET_KEY=y
CONFIG_XDP_SOCKETS=y
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_PNP=y CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_DHCP=y
...@@ -94,18 +95,14 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -94,18 +95,14 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_RT=m
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m CONFIG_NFT_CT=m
CONFIG_NFT_FLOW_OFFLOAD=m CONFIG_NFT_FLOW_OFFLOAD=m
CONFIG_NFT_SET_RBTREE=m
CONFIG_NFT_SET_HASH=m
CONFIG_NFT_SET_BITMAP=m
CONFIG_NFT_COUNTER=m CONFIG_NFT_COUNTER=m
CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_LOG=m CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m CONFIG_NFT_LIMIT=m
CONFIG_NFT_MASQ=m CONFIG_NFT_MASQ=m
...@@ -118,6 +115,7 @@ CONFIG_NFT_REJECT=m ...@@ -118,6 +115,7 @@ CONFIG_NFT_REJECT=m
CONFIG_NFT_COMPAT=m CONFIG_NFT_COMPAT=m
CONFIG_NFT_HASH=m CONFIG_NFT_HASH=m
CONFIG_NFT_FIB_INET=m CONFIG_NFT_FIB_INET=m
CONFIG_NFT_SOCKET=m
CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m
CONFIG_NFT_FWD_NETDEV=m CONFIG_NFT_FWD_NETDEV=m
CONFIG_NFT_FIB_NETDEV=m CONFIG_NFT_FIB_NETDEV=m
...@@ -196,7 +194,6 @@ CONFIG_IP_SET_HASH_NETPORT=m ...@@ -196,7 +194,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_DUP_IPV4=m
CONFIG_NFT_FIB_IPV4=m CONFIG_NFT_FIB_IPV4=m
...@@ -227,7 +224,6 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -227,7 +224,6 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ_IPV6=m
...@@ -256,7 +252,6 @@ CONFIG_IP6_NF_NAT=m ...@@ -256,7 +252,6 @@ CONFIG_IP6_NF_NAT=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=y CONFIG_NF_TABLES_BRIDGE=y
CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NF_LOG_BRIDGE=m CONFIG_NF_LOG_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
...@@ -297,6 +292,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m ...@@ -297,6 +292,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
CONFIG_DNS_RESOLVER=y CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
# CONFIG_BATMAN_ADV_BATMAN_V is not set
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_NC=y
CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_MCAST=y
...@@ -344,6 +340,7 @@ CONFIG_DM_UNSTRIPED=m ...@@ -344,6 +340,7 @@ CONFIG_DM_UNSTRIPED=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_THIN_PROVISIONING=m
CONFIG_DM_WRITECACHE=m
CONFIG_DM_ERA=m CONFIG_DM_ERA=m
CONFIG_DM_MIRROR=m CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m CONFIG_DM_RAID=m
...@@ -380,14 +377,15 @@ CONFIG_VETH=m ...@@ -380,14 +377,15 @@ CONFIG_VETH=m
# CONFIG_NET_VENDOR_AMAZON is not set # CONFIG_NET_VENDOR_AMAZON is not set
# CONFIG_NET_VENDOR_AQUANTIA is not set # CONFIG_NET_VENDOR_AQUANTIA is not set
# CONFIG_NET_VENDOR_ARC is not set # CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_CORTINA is not set
# CONFIG_NET_VENDOR_EZCHIP is not set # CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_HUAWEI is not set
CONFIG_MVME16x_NET=y CONFIG_MVME16x_NET=y
# CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MARVELL is not set
# CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROSEMI is not set
# CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NATSEMI is not set
# CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NETRONOME is not set
# CONFIG_NET_VENDOR_NI is not set # CONFIG_NET_VENDOR_NI is not set
...@@ -399,9 +397,9 @@ CONFIG_MVME16x_NET=y ...@@ -399,9 +397,9 @@ CONFIG_MVME16x_NET=y
# CONFIG_NET_VENDOR_SOLARFLARE is not set # CONFIG_NET_VENDOR_SOLARFLARE is not set
# CONFIG_NET_VENDOR_SOCIONEXT is not set # CONFIG_NET_VENDOR_SOCIONEXT is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -433,6 +431,7 @@ CONFIG_HIDRAW=y ...@@ -433,6 +431,7 @@ CONFIG_HIDRAW=y
CONFIG_UHID=m CONFIG_UHID=m
# CONFIG_HID_GENERIC is not set # CONFIG_HID_GENERIC is not set
# CONFIG_HID_ITE is not set # CONFIG_HID_ITE is not set
# CONFIG_HID_REDRAGON is not set
# CONFIG_USB_SUPPORT is not set # CONFIG_USB_SUPPORT is not set
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
...@@ -450,7 +449,7 @@ CONFIG_FS_ENCRYPTION=m ...@@ -450,7 +449,7 @@ CONFIG_FS_ENCRYPTION=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_PRINT_QUOTA_WARNING is not set # CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_AUTOFS4_FS=m CONFIG_AUTOFS_FS=m
CONFIG_FUSE_FS=m CONFIG_FUSE_FS=m
CONFIG_CUSE=m CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m CONFIG_OVERLAY_FS=m
...@@ -551,6 +550,7 @@ CONFIG_TEST_KSTRTOX=m ...@@ -551,6 +550,7 @@ CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_OVERFLOW=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -573,6 +573,11 @@ CONFIG_CRYPTO_CRYPTD=m ...@@ -573,6 +573,11 @@ CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_MCRYPTD=m CONFIG_CRYPTO_MCRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_AEGIS128=m
CONFIG_CRYPTO_AEGIS128L=m
CONFIG_CRYPTO_AEGIS256=m
CONFIG_CRYPTO_MORUS640=m
CONFIG_CRYPTO_MORUS1280=m
CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CFB=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
...@@ -608,6 +613,7 @@ CONFIG_CRYPTO_LZO=m ...@@ -608,6 +613,7 @@ CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_842=m CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4HC=m
CONFIG_CRYPTO_ZSTD=m
CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HASH=y
CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_CTR=y
......
...@@ -48,6 +48,7 @@ CONFIG_UNIX_DIAG=m ...@@ -48,6 +48,7 @@ CONFIG_UNIX_DIAG=m
CONFIG_TLS=m CONFIG_TLS=m
CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_MIGRATE=y
CONFIG_NET_KEY=y CONFIG_NET_KEY=y
CONFIG_XDP_SOCKETS=y
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_PNP=y CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_DHCP=y
...@@ -94,18 +95,14 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -94,18 +95,14 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_RT=m
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m CONFIG_NFT_CT=m
CONFIG_NFT_FLOW_OFFLOAD=m CONFIG_NFT_FLOW_OFFLOAD=m
CONFIG_NFT_SET_RBTREE=m
CONFIG_NFT_SET_HASH=m
CONFIG_NFT_SET_BITMAP=m
CONFIG_NFT_COUNTER=m CONFIG_NFT_COUNTER=m
CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_LOG=m CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m CONFIG_NFT_LIMIT=m
CONFIG_NFT_MASQ=m CONFIG_NFT_MASQ=m
...@@ -118,6 +115,7 @@ CONFIG_NFT_REJECT=m ...@@ -118,6 +115,7 @@ CONFIG_NFT_REJECT=m
CONFIG_NFT_COMPAT=m CONFIG_NFT_COMPAT=m
CONFIG_NFT_HASH=m CONFIG_NFT_HASH=m
CONFIG_NFT_FIB_INET=m CONFIG_NFT_FIB_INET=m
CONFIG_NFT_SOCKET=m
CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m
CONFIG_NFT_FWD_NETDEV=m CONFIG_NFT_FWD_NETDEV=m
CONFIG_NFT_FIB_NETDEV=m CONFIG_NFT_FIB_NETDEV=m
...@@ -196,7 +194,6 @@ CONFIG_IP_SET_HASH_NETPORT=m ...@@ -196,7 +194,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_DUP_IPV4=m
CONFIG_NFT_FIB_IPV4=m CONFIG_NFT_FIB_IPV4=m
...@@ -227,7 +224,6 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -227,7 +224,6 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ_IPV6=m
...@@ -256,7 +252,6 @@ CONFIG_IP6_NF_NAT=m ...@@ -256,7 +252,6 @@ CONFIG_IP6_NF_NAT=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=y CONFIG_NF_TABLES_BRIDGE=y
CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NF_LOG_BRIDGE=m CONFIG_NF_LOG_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
...@@ -297,6 +292,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m ...@@ -297,6 +292,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
CONFIG_DNS_RESOLVER=y CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
# CONFIG_BATMAN_ADV_BATMAN_V is not set
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_NC=y
CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_MCAST=y
...@@ -350,6 +346,7 @@ CONFIG_DM_UNSTRIPED=m ...@@ -350,6 +346,7 @@ CONFIG_DM_UNSTRIPED=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_THIN_PROVISIONING=m
CONFIG_DM_WRITECACHE=m
CONFIG_DM_ERA=m CONFIG_DM_ERA=m
CONFIG_DM_MIRROR=m CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m CONFIG_DM_RAID=m
...@@ -388,8 +385,8 @@ CONFIG_VETH=m ...@@ -388,8 +385,8 @@ CONFIG_VETH=m
# CONFIG_NET_VENDOR_AMD is not set # CONFIG_NET_VENDOR_AMD is not set
# CONFIG_NET_VENDOR_AQUANTIA is not set # CONFIG_NET_VENDOR_AQUANTIA is not set
# CONFIG_NET_VENDOR_ARC is not set # CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_CIRRUS is not set # CONFIG_NET_VENDOR_CIRRUS is not set
# CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_CORTINA is not set
# CONFIG_NET_VENDOR_EZCHIP is not set # CONFIG_NET_VENDOR_EZCHIP is not set
...@@ -398,6 +395,7 @@ CONFIG_VETH=m ...@@ -398,6 +395,7 @@ CONFIG_VETH=m
# CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_INTEL is not set
# CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MARVELL is not set
# CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROSEMI is not set
# CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NETRONOME is not set
# CONFIG_NET_VENDOR_NI is not set # CONFIG_NET_VENDOR_NI is not set
CONFIG_NE2000=y CONFIG_NE2000=y
...@@ -410,9 +408,9 @@ CONFIG_NE2000=y ...@@ -410,9 +408,9 @@ CONFIG_NE2000=y
# CONFIG_NET_VENDOR_SMSC is not set # CONFIG_NET_VENDOR_SMSC is not set
# CONFIG_NET_VENDOR_SOCIONEXT is not set # CONFIG_NET_VENDOR_SOCIONEXT is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PLIP=m CONFIG_PLIP=m
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
...@@ -455,6 +453,7 @@ CONFIG_HIDRAW=y ...@@ -455,6 +453,7 @@ CONFIG_HIDRAW=y
CONFIG_UHID=m CONFIG_UHID=m
# CONFIG_HID_GENERIC is not set # CONFIG_HID_GENERIC is not set
# CONFIG_HID_ITE is not set # CONFIG_HID_ITE is not set
# CONFIG_HID_REDRAGON is not set
# CONFIG_USB_SUPPORT is not set # CONFIG_USB_SUPPORT is not set
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
...@@ -473,7 +472,7 @@ CONFIG_FS_ENCRYPTION=m ...@@ -473,7 +472,7 @@ CONFIG_FS_ENCRYPTION=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_PRINT_QUOTA_WARNING is not set # CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_AUTOFS4_FS=m CONFIG_AUTOFS_FS=m
CONFIG_FUSE_FS=m CONFIG_FUSE_FS=m
CONFIG_CUSE=m CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m CONFIG_OVERLAY_FS=m
...@@ -574,6 +573,7 @@ CONFIG_TEST_KSTRTOX=m ...@@ -574,6 +573,7 @@ CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_OVERFLOW=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -596,6 +596,11 @@ CONFIG_CRYPTO_CRYPTD=m ...@@ -596,6 +596,11 @@ CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_MCRYPTD=m CONFIG_CRYPTO_MCRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_AEGIS128=m
CONFIG_CRYPTO_AEGIS128L=m
CONFIG_CRYPTO_AEGIS256=m
CONFIG_CRYPTO_MORUS640=m
CONFIG_CRYPTO_MORUS1280=m
CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CFB=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
...@@ -631,6 +636,7 @@ CONFIG_CRYPTO_LZO=m ...@@ -631,6 +636,7 @@ CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_842=m CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4HC=m
CONFIG_CRYPTO_ZSTD=m
CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HASH=y
CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_CTR=y
......
...@@ -45,6 +45,7 @@ CONFIG_UNIX_DIAG=m ...@@ -45,6 +45,7 @@ CONFIG_UNIX_DIAG=m
CONFIG_TLS=m CONFIG_TLS=m
CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_MIGRATE=y
CONFIG_NET_KEY=y CONFIG_NET_KEY=y
CONFIG_XDP_SOCKETS=y
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_PNP=y CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_DHCP=y
...@@ -91,18 +92,14 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -91,18 +92,14 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_RT=m
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m CONFIG_NFT_CT=m
CONFIG_NFT_FLOW_OFFLOAD=m CONFIG_NFT_FLOW_OFFLOAD=m
CONFIG_NFT_SET_RBTREE=m
CONFIG_NFT_SET_HASH=m
CONFIG_NFT_SET_BITMAP=m
CONFIG_NFT_COUNTER=m CONFIG_NFT_COUNTER=m
CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_LOG=m CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m CONFIG_NFT_LIMIT=m
CONFIG_NFT_MASQ=m CONFIG_NFT_MASQ=m
...@@ -115,6 +112,7 @@ CONFIG_NFT_REJECT=m ...@@ -115,6 +112,7 @@ CONFIG_NFT_REJECT=m
CONFIG_NFT_COMPAT=m CONFIG_NFT_COMPAT=m
CONFIG_NFT_HASH=m CONFIG_NFT_HASH=m
CONFIG_NFT_FIB_INET=m CONFIG_NFT_FIB_INET=m
CONFIG_NFT_SOCKET=m
CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m
CONFIG_NFT_FWD_NETDEV=m CONFIG_NFT_FWD_NETDEV=m
CONFIG_NFT_FIB_NETDEV=m CONFIG_NFT_FIB_NETDEV=m
...@@ -193,7 +191,6 @@ CONFIG_IP_SET_HASH_NETPORT=m ...@@ -193,7 +191,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_DUP_IPV4=m
CONFIG_NFT_FIB_IPV4=m CONFIG_NFT_FIB_IPV4=m
...@@ -224,7 +221,6 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -224,7 +221,6 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ_IPV6=m
...@@ -253,7 +249,6 @@ CONFIG_IP6_NF_NAT=m ...@@ -253,7 +249,6 @@ CONFIG_IP6_NF_NAT=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=y CONFIG_NF_TABLES_BRIDGE=y
CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NF_LOG_BRIDGE=m CONFIG_NF_LOG_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
...@@ -294,6 +289,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m ...@@ -294,6 +289,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
CONFIG_DNS_RESOLVER=y CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
# CONFIG_BATMAN_ADV_BATMAN_V is not set
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_NC=y
CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_MCAST=y
...@@ -341,6 +337,7 @@ CONFIG_DM_UNSTRIPED=m ...@@ -341,6 +337,7 @@ CONFIG_DM_UNSTRIPED=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_THIN_PROVISIONING=m
CONFIG_DM_WRITECACHE=m
CONFIG_DM_ERA=m CONFIG_DM_ERA=m
CONFIG_DM_MIRROR=m CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m CONFIG_DM_RAID=m
...@@ -385,6 +382,7 @@ CONFIG_SUN3LANCE=y ...@@ -385,6 +382,7 @@ CONFIG_SUN3LANCE=y
CONFIG_SUN3_82586=y CONFIG_SUN3_82586=y
# CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MARVELL is not set
# CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROSEMI is not set
# CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NATSEMI is not set
# CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NETRONOME is not set
# CONFIG_NET_VENDOR_NI is not set # CONFIG_NET_VENDOR_NI is not set
...@@ -397,9 +395,9 @@ CONFIG_SUN3_82586=y ...@@ -397,9 +395,9 @@ CONFIG_SUN3_82586=y
# CONFIG_NET_VENDOR_SOCIONEXT is not set # CONFIG_NET_VENDOR_SOCIONEXT is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_SUN is not set # CONFIG_NET_VENDOR_SUN is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -435,6 +433,7 @@ CONFIG_HIDRAW=y ...@@ -435,6 +433,7 @@ CONFIG_HIDRAW=y
CONFIG_UHID=m CONFIG_UHID=m
# CONFIG_HID_GENERIC is not set # CONFIG_HID_GENERIC is not set
# CONFIG_HID_ITE is not set # CONFIG_HID_ITE is not set
# CONFIG_HID_REDRAGON is not set
# CONFIG_USB_SUPPORT is not set # CONFIG_USB_SUPPORT is not set
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
...@@ -452,7 +451,7 @@ CONFIG_FS_ENCRYPTION=m ...@@ -452,7 +451,7 @@ CONFIG_FS_ENCRYPTION=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_PRINT_QUOTA_WARNING is not set # CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_AUTOFS4_FS=m CONFIG_AUTOFS_FS=m
CONFIG_FUSE_FS=m CONFIG_FUSE_FS=m
CONFIG_CUSE=m CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m CONFIG_OVERLAY_FS=m
...@@ -553,6 +552,7 @@ CONFIG_TEST_KSTRTOX=m ...@@ -553,6 +552,7 @@ CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_OVERFLOW=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -574,6 +574,11 @@ CONFIG_CRYPTO_CRYPTD=m ...@@ -574,6 +574,11 @@ CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_MCRYPTD=m CONFIG_CRYPTO_MCRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_AEGIS128=m
CONFIG_CRYPTO_AEGIS128L=m
CONFIG_CRYPTO_AEGIS256=m
CONFIG_CRYPTO_MORUS640=m
CONFIG_CRYPTO_MORUS1280=m
CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CFB=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
...@@ -609,6 +614,7 @@ CONFIG_CRYPTO_LZO=m ...@@ -609,6 +614,7 @@ CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_842=m CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4HC=m
CONFIG_CRYPTO_ZSTD=m
CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HASH=y
CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_CTR=y
......
...@@ -45,6 +45,7 @@ CONFIG_UNIX_DIAG=m ...@@ -45,6 +45,7 @@ CONFIG_UNIX_DIAG=m
CONFIG_TLS=m CONFIG_TLS=m
CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_MIGRATE=y
CONFIG_NET_KEY=y CONFIG_NET_KEY=y
CONFIG_XDP_SOCKETS=y
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_PNP=y CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_DHCP=y
...@@ -91,18 +92,14 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -91,18 +92,14 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
CONFIG_NFT_RT=m
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m CONFIG_NFT_CT=m
CONFIG_NFT_FLOW_OFFLOAD=m CONFIG_NFT_FLOW_OFFLOAD=m
CONFIG_NFT_SET_RBTREE=m
CONFIG_NFT_SET_HASH=m
CONFIG_NFT_SET_BITMAP=m
CONFIG_NFT_COUNTER=m CONFIG_NFT_COUNTER=m
CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_LOG=m CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m CONFIG_NFT_LIMIT=m
CONFIG_NFT_MASQ=m CONFIG_NFT_MASQ=m
...@@ -115,6 +112,7 @@ CONFIG_NFT_REJECT=m ...@@ -115,6 +112,7 @@ CONFIG_NFT_REJECT=m
CONFIG_NFT_COMPAT=m CONFIG_NFT_COMPAT=m
CONFIG_NFT_HASH=m CONFIG_NFT_HASH=m
CONFIG_NFT_FIB_INET=m CONFIG_NFT_FIB_INET=m
CONFIG_NFT_SOCKET=m
CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m
CONFIG_NFT_FWD_NETDEV=m CONFIG_NFT_FWD_NETDEV=m
CONFIG_NFT_FIB_NETDEV=m CONFIG_NFT_FIB_NETDEV=m
...@@ -193,7 +191,6 @@ CONFIG_IP_SET_HASH_NETPORT=m ...@@ -193,7 +191,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET_LIST_SET=m
CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_SOCKET_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_DUP_IPV4=m
CONFIG_NFT_FIB_IPV4=m CONFIG_NFT_FIB_IPV4=m
...@@ -224,7 +221,6 @@ CONFIG_IP_NF_ARPTABLES=m ...@@ -224,7 +221,6 @@ CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ_IPV6=m
...@@ -253,7 +249,6 @@ CONFIG_IP6_NF_NAT=m ...@@ -253,7 +249,6 @@ CONFIG_IP6_NF_NAT=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_NF_TABLES_BRIDGE=y CONFIG_NF_TABLES_BRIDGE=y
CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NF_LOG_BRIDGE=m CONFIG_NF_LOG_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
...@@ -294,6 +289,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m ...@@ -294,6 +289,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
CONFIG_DNS_RESOLVER=y CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
# CONFIG_BATMAN_ADV_BATMAN_V is not set
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_NC=y
CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_MCAST=y
...@@ -341,6 +337,7 @@ CONFIG_DM_UNSTRIPED=m ...@@ -341,6 +337,7 @@ CONFIG_DM_UNSTRIPED=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_THIN_PROVISIONING=m
CONFIG_DM_WRITECACHE=m
CONFIG_DM_ERA=m CONFIG_DM_ERA=m
CONFIG_DM_MIRROR=m CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m CONFIG_DM_RAID=m
...@@ -378,14 +375,15 @@ CONFIG_VETH=m ...@@ -378,14 +375,15 @@ CONFIG_VETH=m
CONFIG_SUN3LANCE=y CONFIG_SUN3LANCE=y
# CONFIG_NET_VENDOR_AQUANTIA is not set # CONFIG_NET_VENDOR_AQUANTIA is not set
# CONFIG_NET_VENDOR_ARC is not set # CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_CORTINA is not set
# CONFIG_NET_VENDOR_EZCHIP is not set # CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_HUAWEI is not set
# CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_INTEL is not set
# CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MARVELL is not set
# CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROSEMI is not set
# CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NATSEMI is not set
# CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NETRONOME is not set
# CONFIG_NET_VENDOR_NI is not set # CONFIG_NET_VENDOR_NI is not set
...@@ -397,9 +395,9 @@ CONFIG_SUN3LANCE=y ...@@ -397,9 +395,9 @@ CONFIG_SUN3LANCE=y
# CONFIG_NET_VENDOR_SOLARFLARE is not set # CONFIG_NET_VENDOR_SOLARFLARE is not set
# CONFIG_NET_VENDOR_SOCIONEXT is not set # CONFIG_NET_VENDOR_SOCIONEXT is not set
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -435,6 +433,7 @@ CONFIG_HIDRAW=y ...@@ -435,6 +433,7 @@ CONFIG_HIDRAW=y
CONFIG_UHID=m CONFIG_UHID=m
# CONFIG_HID_GENERIC is not set # CONFIG_HID_GENERIC is not set
# CONFIG_HID_ITE is not set # CONFIG_HID_ITE is not set
# CONFIG_HID_REDRAGON is not set
# CONFIG_USB_SUPPORT is not set # CONFIG_USB_SUPPORT is not set
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
...@@ -452,7 +451,7 @@ CONFIG_FS_ENCRYPTION=m ...@@ -452,7 +451,7 @@ CONFIG_FS_ENCRYPTION=m
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_PRINT_QUOTA_WARNING is not set # CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_AUTOFS4_FS=m CONFIG_AUTOFS_FS=m
CONFIG_FUSE_FS=m CONFIG_FUSE_FS=m
CONFIG_CUSE=m CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m CONFIG_OVERLAY_FS=m
...@@ -553,6 +552,7 @@ CONFIG_TEST_KSTRTOX=m ...@@ -553,6 +552,7 @@ CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_OVERFLOW=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -575,6 +575,11 @@ CONFIG_CRYPTO_CRYPTD=m ...@@ -575,6 +575,11 @@ CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_MCRYPTD=m CONFIG_CRYPTO_MCRYPTD=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_AEGIS128=m
CONFIG_CRYPTO_AEGIS128L=m
CONFIG_CRYPTO_AEGIS256=m
CONFIG_CRYPTO_MORUS640=m
CONFIG_CRYPTO_MORUS1280=m
CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CFB=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
...@@ -610,6 +615,7 @@ CONFIG_CRYPTO_LZO=m ...@@ -610,6 +615,7 @@ CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_842=m CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4HC=m
CONFIG_CRYPTO_ZSTD=m
CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HASH=y
CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_CTR=y
......
generic-y += barrier.h generic-y += barrier.h
generic-y += compat.h generic-y += compat.h
generic-y += device.h generic-y += device.h
generic-y += dma-mapping.h
generic-y += emergency-restart.h generic-y += emergency-restart.h
generic-y += exec.h generic-y += exec.h
generic-y += extable.h generic-y += extable.h
......
...@@ -454,7 +454,7 @@ static inline unsigned long ffz(unsigned long word) ...@@ -454,7 +454,7 @@ static inline unsigned long ffz(unsigned long word)
*/ */
#if (defined(__mcfisaaplus__) || defined(__mcfisac__)) && \ #if (defined(__mcfisaaplus__) || defined(__mcfisac__)) && \
!defined(CONFIG_M68000) && !defined(CONFIG_MCPU32) !defined(CONFIG_M68000) && !defined(CONFIG_MCPU32)
static inline int __ffs(int x) static inline unsigned long __ffs(unsigned long x)
{ {
__asm__ __volatile__ ("bitrev %0; ff1 %0" __asm__ __volatile__ ("bitrev %0; ff1 %0"
: "=d" (x) : "=d" (x)
...@@ -493,7 +493,11 @@ static inline int ffs(int x) ...@@ -493,7 +493,11 @@ static inline int ffs(int x)
: "dm" (x & -x)); : "dm" (x & -x));
return 32 - cnt; return 32 - cnt;
} }
#define __ffs(x) (ffs(x) - 1)
static inline unsigned long __ffs(unsigned long x)
{
return ffs(x) - 1;
}
/* /*
* fls: find last bit set. * fls: find last bit set.
......
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _M68K_DMA_MAPPING_H
#define _M68K_DMA_MAPPING_H
extern const struct dma_map_ops m68k_dma_ops;
static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
{
return &m68k_dma_ops;
}
#endif /* _M68K_DMA_MAPPING_H */
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#ifndef _M68K_IO_H
#define _M68K_IO_H
#if defined(__uClinux__) || defined(CONFIG_COLDFIRE) #if defined(__uClinux__) || defined(CONFIG_COLDFIRE)
#include <asm/io_no.h> #include <asm/io_no.h>
#else #else
#include <asm/io_mm.h> #include <asm/io_mm.h>
#endif #endif
#include <asm-generic/io.h>
#endif /* _M68K_IO_H */
...@@ -16,13 +16,11 @@ ...@@ -16,13 +16,11 @@
* isa_readX(),isa_writeX() are for ISA memory * isa_readX(),isa_writeX() are for ISA memory
*/ */
#ifndef _IO_H #ifndef _M68K_IO_MM_H
#define _IO_H #define _M68K_IO_MM_H
#ifdef __KERNEL__ #ifdef __KERNEL__
#define ARCH_HAS_IOREMAP_WT
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/raw_io.h> #include <asm/raw_io.h>
#include <asm/virtconvert.h> #include <asm/virtconvert.h>
...@@ -369,40 +367,6 @@ static inline void isa_delay(void) ...@@ -369,40 +367,6 @@ static inline void isa_delay(void)
#define writew(val, addr) out_le16((addr), (val)) #define writew(val, addr) out_le16((addr), (val))
#endif /* CONFIG_ATARI_ROM_ISA */ #endif /* CONFIG_ATARI_ROM_ISA */
#if !defined(CONFIG_ISA) && !defined(CONFIG_ATARI_ROM_ISA)
/*
* We need to define dummy functions for GENERIC_IOMAP support.
*/
#define inb(port) 0xff
#define inb_p(port) 0xff
#define outb(val,port) ((void)0)
#define outb_p(val,port) ((void)0)
#define inw(port) 0xffff
#define inw_p(port) 0xffff
#define outw(val,port) ((void)0)
#define outw_p(val,port) ((void)0)
#define inl(port) 0xffffffffUL
#define inl_p(port) 0xffffffffUL
#define outl(val,port) ((void)0)
#define outl_p(val,port) ((void)0)
#define insb(port,buf,nr) ((void)0)
#define outsb(port,buf,nr) ((void)0)
#define insw(port,buf,nr) ((void)0)
#define outsw(port,buf,nr) ((void)0)
#define insl(port,buf,nr) ((void)0)
#define outsl(port,buf,nr) ((void)0)
/*
* These should be valid on any ioremap()ed region
*/
#define readb(addr) in_8(addr)
#define writeb(val,addr) out_8((addr),(val))
#define readw(addr) in_le16(addr)
#define writew(val,addr) out_le16((addr),(val))
#endif /* !CONFIG_ISA && !CONFIG_ATARI_ROM_ISA */
#define readl(addr) in_le32(addr) #define readl(addr) in_le32(addr)
#define writel(val,addr) out_le32((addr),(val)) #define writel(val,addr) out_le32((addr),(val))
...@@ -444,4 +408,4 @@ static inline void isa_delay(void) ...@@ -444,4 +408,4 @@ static inline void isa_delay(void)
#define writew_relaxed(b, addr) writew(b, addr) #define writew_relaxed(b, addr) writew(b, addr)
#define writel_relaxed(b, addr) writel(b, addr) #define writel_relaxed(b, addr) writel(b, addr)
#endif /* _IO_H */ #endif /* _M68K_IO_MM_H */
...@@ -131,19 +131,7 @@ static inline void writel(u32 value, volatile void __iomem *addr) ...@@ -131,19 +131,7 @@ static inline void writel(u32 value, volatile void __iomem *addr)
#define PCI_SPACE_LIMIT PCI_IO_MASK #define PCI_SPACE_LIMIT PCI_IO_MASK
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
/*
* These are defined in kmap.h as static inline functions. To maintain
* previous behavior we put these define guards here so io_mm.h doesn't
* see them.
*/
#ifdef CONFIG_MMU
#define memset_io memset_io
#define memcpy_fromio memcpy_fromio
#define memcpy_toio memcpy_toio
#endif
#include <asm/kmap.h> #include <asm/kmap.h>
#include <asm/virtconvert.h> #include <asm/virtconvert.h>
#include <asm-generic/io.h>
#endif /* _M68KNOMMU_IO_H */ #endif /* _M68KNOMMU_IO_H */
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
#define ARCH_HAS_IOREMAP_WT
/* Values for nocacheflag and cmode */ /* Values for nocacheflag and cmode */
#define IOMAP_FULL_CACHING 0 #define IOMAP_FULL_CACHING 0
#define IOMAP_NOCACHE_SER 1 #define IOMAP_NOCACHE_SER 1
...@@ -16,6 +18,7 @@ ...@@ -16,6 +18,7 @@
*/ */
extern void __iomem *__ioremap(unsigned long physaddr, unsigned long size, extern void __iomem *__ioremap(unsigned long physaddr, unsigned long size,
int cacheflag); int cacheflag);
#define iounmap iounmap
extern void iounmap(void __iomem *addr); extern void iounmap(void __iomem *addr);
extern void __iounmap(void *addr, unsigned long size); extern void __iounmap(void *addr, unsigned long size);
...@@ -33,31 +36,35 @@ static inline void __iomem *ioremap_nocache(unsigned long physaddr, ...@@ -33,31 +36,35 @@ static inline void __iomem *ioremap_nocache(unsigned long physaddr,
} }
#define ioremap_uc ioremap_nocache #define ioremap_uc ioremap_nocache
#define ioremap_wt ioremap_wt
static inline void __iomem *ioremap_wt(unsigned long physaddr, static inline void __iomem *ioremap_wt(unsigned long physaddr,
unsigned long size) unsigned long size)
{ {
return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); return __ioremap(physaddr, size, IOMAP_WRITETHROUGH);
} }
#define ioremap_fillcache ioremap_fullcache #define ioremap_fullcache ioremap_fullcache
static inline void __iomem *ioremap_fullcache(unsigned long physaddr, static inline void __iomem *ioremap_fullcache(unsigned long physaddr,
unsigned long size) unsigned long size)
{ {
return __ioremap(physaddr, size, IOMAP_FULL_CACHING); return __ioremap(physaddr, size, IOMAP_FULL_CACHING);
} }
#define memset_io memset_io
static inline void memset_io(volatile void __iomem *addr, unsigned char val, static inline void memset_io(volatile void __iomem *addr, unsigned char val,
int count) int count)
{ {
__builtin_memset((void __force *) addr, val, count); __builtin_memset((void __force *) addr, val, count);
} }
#define memcpy_fromio memcpy_fromio
static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, static inline void memcpy_fromio(void *dst, const volatile void __iomem *src,
int count) int count)
{ {
__builtin_memcpy(dst, (void __force *) src, count); __builtin_memcpy(dst, (void __force *) src, count);
} }
#define memcpy_toio memcpy_toio
static inline void memcpy_toio(volatile void __iomem *dst, const void *src, static inline void memcpy_toio(volatile void __iomem *dst, const void *src,
int count) int count)
{ {
......
...@@ -22,7 +22,6 @@ extern int (*mach_hwclk)(int, struct rtc_time*); ...@@ -22,7 +22,6 @@ extern int (*mach_hwclk)(int, struct rtc_time*);
extern unsigned int (*mach_get_ss)(void); extern unsigned int (*mach_get_ss)(void);
extern int (*mach_get_rtc_pll)(struct rtc_pll_info *); extern int (*mach_get_rtc_pll)(struct rtc_pll_info *);
extern int (*mach_set_rtc_pll)(struct rtc_pll_info *); extern int (*mach_set_rtc_pll)(struct rtc_pll_info *);
extern int (*mach_set_clock_mmss)(unsigned long);
extern void (*mach_reset)( void ); extern void (*mach_reset)( void );
extern void (*mach_halt)( void ); extern void (*mach_halt)( void );
extern void (*mach_power_off)( void ); extern void (*mach_power_off)( void );
......
...@@ -57,7 +57,6 @@ struct mac_model ...@@ -57,7 +57,6 @@ struct mac_model
#define MAC_SCSI_IIFX 5 #define MAC_SCSI_IIFX 5
#define MAC_SCSI_DUO 6 #define MAC_SCSI_DUO 6
#define MAC_SCSI_LC 7 #define MAC_SCSI_LC 7
#define MAC_SCSI_LATE 8
#define MAC_IDE_NONE 0 #define MAC_IDE_NONE 0
#define MAC_IDE_QUADRA 1 #define MAC_IDE_QUADRA 1
......
...@@ -18,7 +18,7 @@ extern unsigned long memory_end; ...@@ -18,7 +18,7 @@ extern unsigned long memory_end;
#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE #define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE
#define __pa(vaddr) ((unsigned long)(vaddr)) #define __pa(vaddr) ((unsigned long)(vaddr))
#define __va(paddr) ((void *)(paddr)) #define __va(paddr) ((void *)((unsigned long)(paddr)))
#define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT) #define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT)
#define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT) #define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#undef DEBUG #undef DEBUG
#include <linux/dma-mapping.h> #include <linux/dma-noncoherent.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE) #if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE)
static void *m68k_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
gfp_t flag, unsigned long attrs) gfp_t flag, unsigned long attrs)
{ {
struct page *page, **map; struct page *page, **map;
...@@ -62,7 +62,7 @@ static void *m68k_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, ...@@ -62,7 +62,7 @@ static void *m68k_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
return addr; return addr;
} }
static void m68k_dma_free(struct device *dev, size_t size, void *addr, void arch_dma_free(struct device *dev, size_t size, void *addr,
dma_addr_t handle, unsigned long attrs) dma_addr_t handle, unsigned long attrs)
{ {
pr_debug("dma_free_coherent: %p, %x\n", addr, handle); pr_debug("dma_free_coherent: %p, %x\n", addr, handle);
...@@ -73,8 +73,8 @@ static void m68k_dma_free(struct device *dev, size_t size, void *addr, ...@@ -73,8 +73,8 @@ static void m68k_dma_free(struct device *dev, size_t size, void *addr,
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
static void *m68k_dma_alloc(struct device *dev, size_t size, void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,
dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs) gfp_t gfp, unsigned long attrs)
{ {
void *ret; void *ret;
...@@ -89,7 +89,7 @@ static void *m68k_dma_alloc(struct device *dev, size_t size, ...@@ -89,7 +89,7 @@ static void *m68k_dma_alloc(struct device *dev, size_t size,
return ret; return ret;
} }
static void m68k_dma_free(struct device *dev, size_t size, void *vaddr, void arch_dma_free(struct device *dev, size_t size, void *vaddr,
dma_addr_t dma_handle, unsigned long attrs) dma_addr_t dma_handle, unsigned long attrs)
{ {
free_pages((unsigned long)vaddr, get_order(size)); free_pages((unsigned long)vaddr, get_order(size));
...@@ -97,8 +97,8 @@ static void m68k_dma_free(struct device *dev, size_t size, void *vaddr, ...@@ -97,8 +97,8 @@ static void m68k_dma_free(struct device *dev, size_t size, void *vaddr,
#endif /* CONFIG_MMU && !CONFIG_COLDFIRE */ #endif /* CONFIG_MMU && !CONFIG_COLDFIRE */
static void m68k_dma_sync_single_for_device(struct device *dev, void arch_sync_dma_for_device(struct device *dev, phys_addr_t handle,
dma_addr_t handle, size_t size, enum dma_data_direction dir) size_t size, enum dma_data_direction dir)
{ {
switch (dir) { switch (dir) {
case DMA_BIDIRECTIONAL: case DMA_BIDIRECTIONAL:
...@@ -115,58 +115,6 @@ static void m68k_dma_sync_single_for_device(struct device *dev, ...@@ -115,58 +115,6 @@ static void m68k_dma_sync_single_for_device(struct device *dev,
} }
} }
static void m68k_dma_sync_sg_for_device(struct device *dev,
struct scatterlist *sglist, int nents, enum dma_data_direction dir)
{
int i;
struct scatterlist *sg;
for_each_sg(sglist, sg, nents, i) {
dma_sync_single_for_device(dev, sg->dma_address, sg->length,
dir);
}
}
static dma_addr_t m68k_dma_map_page(struct device *dev, struct page *page,
unsigned long offset, size_t size, enum dma_data_direction dir,
unsigned long attrs)
{
dma_addr_t handle = page_to_phys(page) + offset;
if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
dma_sync_single_for_device(dev, handle, size, dir);
return handle;
}
static int m68k_dma_map_sg(struct device *dev, struct scatterlist *sglist,
int nents, enum dma_data_direction dir, unsigned long attrs)
{
int i;
struct scatterlist *sg;
for_each_sg(sglist, sg, nents, i) {
sg->dma_address = sg_phys(sg);
if (attrs & DMA_ATTR_SKIP_CPU_SYNC)
continue;
dma_sync_single_for_device(dev, sg->dma_address, sg->length,
dir);
}
return nents;
}
const struct dma_map_ops m68k_dma_ops = {
.alloc = m68k_dma_alloc,
.free = m68k_dma_free,
.map_page = m68k_dma_map_page,
.map_sg = m68k_dma_map_sg,
.sync_single_for_device = m68k_dma_sync_single_for_device,
.sync_sg_for_device = m68k_dma_sync_sg_for_device,
};
EXPORT_SYMBOL(m68k_dma_ops);
void arch_setup_pdev_archdata(struct platform_device *pdev) void arch_setup_pdev_archdata(struct platform_device *pdev)
{ {
if (pdev->dev.coherent_dma_mask == DMA_MASK_NONE && if (pdev->dev.coherent_dma_mask == DMA_MASK_NONE &&
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/memblock.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/module.h> #include <linux/module.h>
...@@ -88,7 +89,6 @@ void (*mach_get_hardware_list) (struct seq_file *m); ...@@ -88,7 +89,6 @@ void (*mach_get_hardware_list) (struct seq_file *m);
/* machine dependent timer functions */ /* machine dependent timer functions */
int (*mach_hwclk) (int, struct rtc_time*); int (*mach_hwclk) (int, struct rtc_time*);
EXPORT_SYMBOL(mach_hwclk); EXPORT_SYMBOL(mach_hwclk);
int (*mach_set_clock_mmss) (unsigned long);
unsigned int (*mach_get_ss)(void); unsigned int (*mach_get_ss)(void);
int (*mach_get_rtc_pll)(struct rtc_pll_info *); int (*mach_get_rtc_pll)(struct rtc_pll_info *);
int (*mach_set_rtc_pll)(struct rtc_pll_info *); int (*mach_set_rtc_pll)(struct rtc_pll_info *);
...@@ -165,6 +165,8 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record) ...@@ -165,6 +165,8 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record)
be32_to_cpu(m->addr); be32_to_cpu(m->addr);
m68k_memory[m68k_num_memory].size = m68k_memory[m68k_num_memory].size =
be32_to_cpu(m->size); be32_to_cpu(m->size);
memblock_add(m68k_memory[m68k_num_memory].addr,
m68k_memory[m68k_num_memory].size);
m68k_num_memory++; m68k_num_memory++;
} else } else
pr_warn("%s: too many memory chunks\n", pr_warn("%s: too many memory chunks\n",
...@@ -224,10 +226,6 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record) ...@@ -224,10 +226,6 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record)
void __init setup_arch(char **cmdline_p) void __init setup_arch(char **cmdline_p)
{ {
#ifndef CONFIG_SUN3
int i;
#endif
/* The bootinfo is located right after the kernel */ /* The bootinfo is located right after the kernel */
if (!CPU_IS_COLDFIRE) if (!CPU_IS_COLDFIRE)
m68k_parse_bootinfo((const struct bi_record *)_end); m68k_parse_bootinfo((const struct bi_record *)_end);
...@@ -356,14 +354,9 @@ void __init setup_arch(char **cmdline_p) ...@@ -356,14 +354,9 @@ void __init setup_arch(char **cmdline_p)
#endif #endif
#ifndef CONFIG_SUN3 #ifndef CONFIG_SUN3
for (i = 1; i < m68k_num_memory; i++)
free_bootmem_node(NODE_DATA(i), m68k_memory[i].addr,
m68k_memory[i].size);
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
if (m68k_ramdisk.size) { if (m68k_ramdisk.size) {
reserve_bootmem_node(__virt_to_node(phys_to_virt(m68k_ramdisk.addr)), memblock_reserve(m68k_ramdisk.addr, m68k_ramdisk.size);
m68k_ramdisk.addr, m68k_ramdisk.size,
BOOTMEM_DEFAULT);
initrd_start = (unsigned long)phys_to_virt(m68k_ramdisk.addr); initrd_start = (unsigned long)phys_to_virt(m68k_ramdisk.addr);
initrd_end = initrd_start + m68k_ramdisk.size; initrd_end = initrd_start + m68k_ramdisk.size;
pr_info("initrd: %08lx - %08lx\n", initrd_start, initrd_end); pr_info("initrd: %08lx - %08lx\n", initrd_start, initrd_end);
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/memblock.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/initrd.h> #include <linux/initrd.h>
...@@ -51,7 +52,6 @@ char __initdata command_line[COMMAND_LINE_SIZE]; ...@@ -51,7 +52,6 @@ char __initdata command_line[COMMAND_LINE_SIZE];
/* machine dependent timer functions */ /* machine dependent timer functions */
void (*mach_sched_init)(irq_handler_t handler) __initdata = NULL; void (*mach_sched_init)(irq_handler_t handler) __initdata = NULL;
int (*mach_set_clock_mmss)(unsigned long);
int (*mach_hwclk) (int, struct rtc_time*); int (*mach_hwclk) (int, struct rtc_time*);
/* machine dependent reboot functions */ /* machine dependent reboot functions */
...@@ -86,8 +86,6 @@ void (*mach_power_off)(void); ...@@ -86,8 +86,6 @@ void (*mach_power_off)(void);
void __init setup_arch(char **cmdline_p) void __init setup_arch(char **cmdline_p)
{ {
int bootmap_size;
memory_start = PAGE_ALIGN(_ramstart); memory_start = PAGE_ALIGN(_ramstart);
memory_end = _ramend; memory_end = _ramend;
...@@ -142,6 +140,8 @@ void __init setup_arch(char **cmdline_p) ...@@ -142,6 +140,8 @@ void __init setup_arch(char **cmdline_p)
pr_debug("MEMORY -> ROMFS=0x%p-0x%06lx MEM=0x%06lx-0x%06lx\n ", pr_debug("MEMORY -> ROMFS=0x%p-0x%06lx MEM=0x%06lx-0x%06lx\n ",
__bss_stop, memory_start, memory_start, memory_end); __bss_stop, memory_start, memory_start, memory_end);
memblock_add(memory_start, memory_end - memory_start);
/* Keep a copy of command line */ /* Keep a copy of command line */
*cmdline_p = &command_line[0]; *cmdline_p = &command_line[0];
memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE); memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
...@@ -158,23 +158,10 @@ void __init setup_arch(char **cmdline_p) ...@@ -158,23 +158,10 @@ void __init setup_arch(char **cmdline_p)
min_low_pfn = PFN_DOWN(memory_start); min_low_pfn = PFN_DOWN(memory_start);
max_pfn = max_low_pfn = PFN_DOWN(memory_end); max_pfn = max_low_pfn = PFN_DOWN(memory_end);
bootmap_size = init_bootmem_node(
NODE_DATA(0),
min_low_pfn, /* map goes here */
PFN_DOWN(PAGE_OFFSET),
max_pfn);
/*
* Free the usable memory, we have to make sure we do not free
* the bootmem bitmap so we then reserve it after freeing it :-)
*/
free_bootmem(memory_start, memory_end - memory_start);
reserve_bootmem(memory_start, bootmap_size, BOOTMEM_DEFAULT);
#if defined(CONFIG_UBOOT) && defined(CONFIG_BLK_DEV_INITRD) #if defined(CONFIG_UBOOT) && defined(CONFIG_BLK_DEV_INITRD)
if ((initrd_start > 0) && (initrd_start < initrd_end) && if ((initrd_start > 0) && (initrd_start < initrd_end) &&
(initrd_end < memory_end)) (initrd_end < memory_end))
reserve_bootmem(initrd_start, initrd_end - initrd_start, memblock_reserve(initrd_start, initrd_end - initrd_start);
BOOTMEM_DEFAULT);
#endif /* if defined(CONFIG_BLK_DEV_INITRD) */ #endif /* if defined(CONFIG_BLK_DEV_INITRD) */
/* /*
......
...@@ -57,7 +57,6 @@ static unsigned long mac_orig_videoaddr; ...@@ -57,7 +57,6 @@ static unsigned long mac_orig_videoaddr;
/* Mac specific timer functions */ /* Mac specific timer functions */
extern u32 mac_gettimeoffset(void); extern u32 mac_gettimeoffset(void);
extern int mac_hwclk(int, struct rtc_time *); extern int mac_hwclk(int, struct rtc_time *);
extern int mac_set_clock_mmss(unsigned long);
extern void iop_preinit(void); extern void iop_preinit(void);
extern void iop_init(void); extern void iop_init(void);
extern void via_init(void); extern void via_init(void);
...@@ -158,7 +157,6 @@ void __init config_mac(void) ...@@ -158,7 +157,6 @@ void __init config_mac(void)
mach_get_model = mac_get_model; mach_get_model = mac_get_model;
arch_gettimeoffset = mac_gettimeoffset; arch_gettimeoffset = mac_gettimeoffset;
mach_hwclk = mac_hwclk; mach_hwclk = mac_hwclk;
mach_set_clock_mmss = mac_set_clock_mmss;
mach_reset = mac_reset; mach_reset = mac_reset;
mach_halt = mac_poweroff; mach_halt = mac_poweroff;
mach_power_off = mac_poweroff; mach_power_off = mac_poweroff;
...@@ -709,7 +707,7 @@ static struct mac_model mac_data_table[] = { ...@@ -709,7 +707,7 @@ static struct mac_model mac_data_table[] = {
.name = "PowerBook 520", .name = "PowerBook 520",
.adb_type = MAC_ADB_PB2, .adb_type = MAC_ADB_PB2,
.via_type = MAC_VIA_QUADRA, .via_type = MAC_VIA_QUADRA,
.scsi_type = MAC_SCSI_LATE, .scsi_type = MAC_SCSI_OLD,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.ether_type = MAC_ETHER_SONIC, .ether_type = MAC_ETHER_SONIC,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
...@@ -943,18 +941,6 @@ static const struct resource mac_scsi_old_rsrc[] __initconst = { ...@@ -943,18 +941,6 @@ static const struct resource mac_scsi_old_rsrc[] __initconst = {
}, },
}; };
static const struct resource mac_scsi_late_rsrc[] __initconst = {
{
.flags = IORESOURCE_IRQ,
.start = IRQ_MAC_SCSI,
.end = IRQ_MAC_SCSI,
}, {
.flags = IORESOURCE_MEM,
.start = 0x50010000,
.end = 0x50011FFF,
},
};
static const struct resource mac_scsi_ccl_rsrc[] __initconst = { static const struct resource mac_scsi_ccl_rsrc[] __initconst = {
{ {
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
...@@ -1064,11 +1050,6 @@ int __init mac_platform_init(void) ...@@ -1064,11 +1050,6 @@ int __init mac_platform_init(void)
platform_device_register_simple("mac_scsi", 0, platform_device_register_simple("mac_scsi", 0,
mac_scsi_old_rsrc, ARRAY_SIZE(mac_scsi_old_rsrc)); mac_scsi_old_rsrc, ARRAY_SIZE(mac_scsi_old_rsrc));
break; break;
case MAC_SCSI_LATE:
/* XXX PDMA support for PowerBook 500 series needs testing */
platform_device_register_simple("mac_scsi", 0,
mac_scsi_late_rsrc, ARRAY_SIZE(mac_scsi_late_rsrc));
break;
case MAC_SCSI_LC: case MAC_SCSI_LC:
/* Addresses from Mac LC data in Designing Cards & Drivers 3ed. /* Addresses from Mac LC data in Designing Cards & Drivers 3ed.
* Also from the Developer Notes for Classic II, LC III, * Also from the Developer Notes for Classic II, LC III,
......
...@@ -26,33 +26,38 @@ ...@@ -26,33 +26,38 @@
#include <asm/machdep.h> #include <asm/machdep.h>
/* Offset between Unix time (1970-based) and Mac time (1904-based) */ /*
* Offset between Unix time (1970-based) and Mac time (1904-based). Cuda and PMU
* times wrap in 2040. If we need to handle later times, the read_time functions
* need to be changed to interpret wrapped times as post-2040.
*/
#define RTC_OFFSET 2082844800 #define RTC_OFFSET 2082844800
static void (*rom_reset)(void); static void (*rom_reset)(void);
#ifdef CONFIG_ADB_CUDA #ifdef CONFIG_ADB_CUDA
static long cuda_read_time(void) static time64_t cuda_read_time(void)
{ {
struct adb_request req; struct adb_request req;
long time; time64_t time;
if (cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_GET_TIME) < 0) if (cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_GET_TIME) < 0)
return 0; return 0;
while (!req.complete) while (!req.complete)
cuda_poll(); cuda_poll();
time = (req.reply[3] << 24) | (req.reply[4] << 16) | time = (u32)((req.reply[3] << 24) | (req.reply[4] << 16) |
(req.reply[5] << 8) | req.reply[6]; (req.reply[5] << 8) | req.reply[6]);
return time - RTC_OFFSET; return time - RTC_OFFSET;
} }
static void cuda_write_time(long data) static void cuda_write_time(time64_t time)
{ {
struct adb_request req; struct adb_request req;
u32 data = lower_32_bits(time + RTC_OFFSET);
data += RTC_OFFSET;
if (cuda_request(&req, NULL, 6, CUDA_PACKET, CUDA_SET_TIME, if (cuda_request(&req, NULL, 6, CUDA_PACKET, CUDA_SET_TIME,
(data >> 24) & 0xFF, (data >> 16) & 0xFF, (data >> 24) & 0xFF, (data >> 16) & 0xFF,
(data >> 8) & 0xFF, data & 0xFF) < 0) (data >> 8) & 0xFF, data & 0xFF) < 0)
...@@ -86,26 +91,27 @@ static void cuda_write_pram(int offset, __u8 data) ...@@ -86,26 +91,27 @@ static void cuda_write_pram(int offset, __u8 data)
#endif /* CONFIG_ADB_CUDA */ #endif /* CONFIG_ADB_CUDA */
#ifdef CONFIG_ADB_PMU68K #ifdef CONFIG_ADB_PMU68K
static long pmu_read_time(void) static time64_t pmu_read_time(void)
{ {
struct adb_request req; struct adb_request req;
long time; time64_t time;
if (pmu_request(&req, NULL, 1, PMU_READ_RTC) < 0) if (pmu_request(&req, NULL, 1, PMU_READ_RTC) < 0)
return 0; return 0;
while (!req.complete) while (!req.complete)
pmu_poll(); pmu_poll();
time = (req.reply[1] << 24) | (req.reply[2] << 16) | time = (u32)((req.reply[1] << 24) | (req.reply[2] << 16) |
(req.reply[3] << 8) | req.reply[4]; (req.reply[3] << 8) | req.reply[4]);
return time - RTC_OFFSET; return time - RTC_OFFSET;
} }
static void pmu_write_time(long data) static void pmu_write_time(time64_t time)
{ {
struct adb_request req; struct adb_request req;
u32 data = lower_32_bits(time + RTC_OFFSET);
data += RTC_OFFSET;
if (pmu_request(&req, NULL, 5, PMU_SET_RTC, if (pmu_request(&req, NULL, 5, PMU_SET_RTC,
(data >> 24) & 0xFF, (data >> 16) & 0xFF, (data >> 24) & 0xFF, (data >> 16) & 0xFF,
(data >> 8) & 0xFF, data & 0xFF) < 0) (data >> 8) & 0xFF, data & 0xFF) < 0)
...@@ -245,11 +251,11 @@ static void via_write_pram(int offset, __u8 data) ...@@ -245,11 +251,11 @@ static void via_write_pram(int offset, __u8 data)
* is basically any machine with Mac II-style ADB. * is basically any machine with Mac II-style ADB.
*/ */
static long via_read_time(void) static time64_t via_read_time(void)
{ {
union { union {
__u8 cdata[4]; __u8 cdata[4];
long idata; __u32 idata;
} result, last_result; } result, last_result;
int count = 1; int count = 1;
...@@ -270,7 +276,7 @@ static long via_read_time(void) ...@@ -270,7 +276,7 @@ static long via_read_time(void)
via_pram_command(0x8D, &result.cdata[0]); via_pram_command(0x8D, &result.cdata[0]);
if (result.idata == last_result.idata) if (result.idata == last_result.idata)
return result.idata - RTC_OFFSET; return (time64_t)result.idata - RTC_OFFSET;
if (++count > 10) if (++count > 10)
break; break;
...@@ -278,8 +284,8 @@ static long via_read_time(void) ...@@ -278,8 +284,8 @@ static long via_read_time(void)
last_result.idata = result.idata; last_result.idata = result.idata;
} }
pr_err("via_read_time: failed to read a stable value; got 0x%08lx then 0x%08lx\n", pr_err("%s: failed to read a stable value; got 0x%08x then 0x%08x\n",
last_result.idata, result.idata); __func__, last_result.idata, result.idata);
return 0; return 0;
} }
...@@ -291,11 +297,11 @@ static long via_read_time(void) ...@@ -291,11 +297,11 @@ static long via_read_time(void)
* is basically any machine with Mac II-style ADB. * is basically any machine with Mac II-style ADB.
*/ */
static void via_write_time(long time) static void via_write_time(time64_t time)
{ {
union { union {
__u8 cdata[4]; __u8 cdata[4];
long idata; __u32 idata;
} data; } data;
__u8 temp; __u8 temp;
...@@ -304,7 +310,7 @@ static void via_write_time(long time) ...@@ -304,7 +310,7 @@ static void via_write_time(long time)
temp = 0x55; temp = 0x55;
via_pram_command(0x35, &temp); via_pram_command(0x35, &temp);
data.idata = time + RTC_OFFSET; data.idata = lower_32_bits(time + RTC_OFFSET);
via_pram_command(0x01, &data.cdata[3]); via_pram_command(0x01, &data.cdata[3]);
via_pram_command(0x05, &data.cdata[2]); via_pram_command(0x05, &data.cdata[2]);
via_pram_command(0x09, &data.cdata[1]); via_pram_command(0x09, &data.cdata[1]);
...@@ -585,12 +591,15 @@ void mac_reset(void) ...@@ -585,12 +591,15 @@ void mac_reset(void)
* This function translates seconds since 1970 into a proper date. * This function translates seconds since 1970 into a proper date.
* *
* Algorithm cribbed from glibc2.1, __offtime(). * Algorithm cribbed from glibc2.1, __offtime().
*
* This is roughly same as rtc_time64_to_tm(), which we should probably
* use here, but it's only available when CONFIG_RTC_LIB is enabled.
*/ */
#define SECS_PER_MINUTE (60) #define SECS_PER_MINUTE (60)
#define SECS_PER_HOUR (SECS_PER_MINUTE * 60) #define SECS_PER_HOUR (SECS_PER_MINUTE * 60)
#define SECS_PER_DAY (SECS_PER_HOUR * 24) #define SECS_PER_DAY (SECS_PER_HOUR * 24)
static void unmktime(unsigned long time, long offset, static void unmktime(time64_t time, long offset,
int *yearp, int *monp, int *dayp, int *yearp, int *monp, int *dayp,
int *hourp, int *minp, int *secp) int *hourp, int *minp, int *secp)
{ {
...@@ -602,11 +611,10 @@ static void unmktime(unsigned long time, long offset, ...@@ -602,11 +611,10 @@ static void unmktime(unsigned long time, long offset,
/* Leap years. */ /* Leap years. */
{ 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
}; };
long int days, rem, y, wday, yday; int days, rem, y, wday, yday;
const unsigned short int *ip; const unsigned short int *ip;
days = time / SECS_PER_DAY; days = div_u64_rem(time, SECS_PER_DAY, &rem);
rem = time % SECS_PER_DAY;
rem += offset; rem += offset;
while (rem < 0) { while (rem < 0) {
rem += SECS_PER_DAY; rem += SECS_PER_DAY;
...@@ -657,7 +665,7 @@ static void unmktime(unsigned long time, long offset, ...@@ -657,7 +665,7 @@ static void unmktime(unsigned long time, long offset,
int mac_hwclk(int op, struct rtc_time *t) int mac_hwclk(int op, struct rtc_time *t)
{ {
unsigned long now; time64_t now;
if (!op) { /* read */ if (!op) { /* read */
switch (macintosh_config->adb_type) { switch (macintosh_config->adb_type) {
...@@ -693,7 +701,7 @@ int mac_hwclk(int op, struct rtc_time *t) ...@@ -693,7 +701,7 @@ int mac_hwclk(int op, struct rtc_time *t)
__func__, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, __func__, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday,
t->tm_hour, t->tm_min, t->tm_sec); t->tm_hour, t->tm_min, t->tm_sec);
now = mktime(t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, now = mktime64(t->tm_year + 1900, t->tm_mon + 1, t->tm_mday,
t->tm_hour, t->tm_min, t->tm_sec); t->tm_hour, t->tm_min, t->tm_sec);
switch (macintosh_config->adb_type) { switch (macintosh_config->adb_type) {
...@@ -719,19 +727,3 @@ int mac_hwclk(int op, struct rtc_time *t) ...@@ -719,19 +727,3 @@ int mac_hwclk(int op, struct rtc_time *t)
} }
return 0; return 0;
} }
/*
* Set minutes/seconds in the hardware clock
*/
int mac_set_clock_mmss (unsigned long nowtime)
{
struct rtc_time now;
mac_hwclk(0, &now);
now.tm_sec = nowtime % 60;
now.tm_min = (nowtime / 60) % 60;
mac_hwclk(1, &now);
return 0;
}
...@@ -71,7 +71,6 @@ void __init m68k_setup_node(int node) ...@@ -71,7 +71,6 @@ void __init m68k_setup_node(int node)
pg_data_table[i] = pg_data_map + node; pg_data_table[i] = pg_data_map + node;
} }
#endif #endif
pg_data_map[node].bdata = bootmem_node_data + node;
node_set_online(node); node_set_online(node);
} }
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/memblock.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/page.h> #include <asm/page.h>
...@@ -153,31 +154,31 @@ int cf_tlb_miss(struct pt_regs *regs, int write, int dtlb, int extension_word) ...@@ -153,31 +154,31 @@ int cf_tlb_miss(struct pt_regs *regs, int write, int dtlb, int extension_word)
void __init cf_bootmem_alloc(void) void __init cf_bootmem_alloc(void)
{ {
unsigned long start_pfn;
unsigned long memstart; unsigned long memstart;
/* _rambase and _ramend will be naturally page aligned */ /* _rambase and _ramend will be naturally page aligned */
m68k_memory[0].addr = _rambase; m68k_memory[0].addr = _rambase;
m68k_memory[0].size = _ramend - _rambase; m68k_memory[0].size = _ramend - _rambase;
memblock_add(m68k_memory[0].addr, m68k_memory[0].size);
/* compute total pages in system */ /* compute total pages in system */
num_pages = PFN_DOWN(_ramend - _rambase); num_pages = PFN_DOWN(_ramend - _rambase);
/* page numbers */ /* page numbers */
memstart = PAGE_ALIGN(_ramstart); memstart = PAGE_ALIGN(_ramstart);
min_low_pfn = PFN_DOWN(_rambase); min_low_pfn = PFN_DOWN(_rambase);
start_pfn = PFN_DOWN(memstart);
max_pfn = max_low_pfn = PFN_DOWN(_ramend); max_pfn = max_low_pfn = PFN_DOWN(_ramend);
high_memory = (void *)_ramend; high_memory = (void *)_ramend;
/* Reserve kernel text/data/bss */
memblock_reserve(memstart, memstart - _rambase);
m68k_virt_to_node_shift = fls(_ramend - 1) - 6; m68k_virt_to_node_shift = fls(_ramend - 1) - 6;
module_fixup(NULL, __start_fixup, __stop_fixup); module_fixup(NULL, __start_fixup, __stop_fixup);
/* setup bootmem data */ /* setup node data */
m68k_setup_node(0); m68k_setup_node(0);
memstart += init_bootmem_node(NODE_DATA(0), start_pfn,
min_low_pfn, max_low_pfn);
free_bootmem_node(NODE_DATA(0), memstart, _ramend - memstart);
} }
/* /*
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/memblock.h>
#include <linux/gfp.h> #include <linux/gfp.h>
#include <asm/setup.h> #include <asm/setup.h>
...@@ -208,7 +209,7 @@ void __init paging_init(void) ...@@ -208,7 +209,7 @@ void __init paging_init(void)
{ {
unsigned long zones_size[MAX_NR_ZONES] = { 0, }; unsigned long zones_size[MAX_NR_ZONES] = { 0, };
unsigned long min_addr, max_addr; unsigned long min_addr, max_addr;
unsigned long addr, size, end; unsigned long addr;
int i; int i;
#ifdef DEBUG #ifdef DEBUG
...@@ -253,34 +254,20 @@ void __init paging_init(void) ...@@ -253,34 +254,20 @@ void __init paging_init(void)
min_low_pfn = availmem >> PAGE_SHIFT; min_low_pfn = availmem >> PAGE_SHIFT;
max_pfn = max_low_pfn = max_addr >> PAGE_SHIFT; max_pfn = max_low_pfn = max_addr >> PAGE_SHIFT;
for (i = 0; i < m68k_num_memory; i++) { /* Reserve kernel text/data/bss and the memory allocated in head.S */
addr = m68k_memory[i].addr; memblock_reserve(m68k_memory[0].addr, availmem - m68k_memory[0].addr);
end = addr + m68k_memory[i].size;
m68k_setup_node(i);
availmem = PAGE_ALIGN(availmem);
availmem += init_bootmem_node(NODE_DATA(i),
availmem >> PAGE_SHIFT,
addr >> PAGE_SHIFT,
end >> PAGE_SHIFT);
}
/* /*
* Map the physical memory available into the kernel virtual * Map the physical memory available into the kernel virtual
* address space. First initialize the bootmem allocator with * address space. Make sure memblock will not try to allocate
* the memory we already mapped, so map_node() has something * pages beyond the memory we already mapped in head.S
* to allocate.
*/ */
addr = m68k_memory[0].addr; memblock_set_bottom_up(true);
size = m68k_memory[0].size;
free_bootmem_node(NODE_DATA(0), availmem, for (i = 0; i < m68k_num_memory; i++) {
min(m68k_init_mapped_size, size) - (availmem - addr)); m68k_setup_node(i);
map_node(0);
if (size > m68k_init_mapped_size)
free_bootmem_node(NODE_DATA(0), addr + m68k_init_mapped_size,
size - m68k_init_mapped_size);
for (i = 1; i < m68k_num_memory; i++)
map_node(i); map_node(i);
}
flush_tlb_all(); flush_tlb_all();
......
...@@ -40,7 +40,6 @@ static void mvme147_get_model(char *model); ...@@ -40,7 +40,6 @@ static void mvme147_get_model(char *model);
extern void mvme147_sched_init(irq_handler_t handler); extern void mvme147_sched_init(irq_handler_t handler);
extern u32 mvme147_gettimeoffset(void); extern u32 mvme147_gettimeoffset(void);
extern int mvme147_hwclk (int, struct rtc_time *); extern int mvme147_hwclk (int, struct rtc_time *);
extern int mvme147_set_clock_mmss (unsigned long);
extern void mvme147_reset (void); extern void mvme147_reset (void);
...@@ -92,7 +91,6 @@ void __init config_mvme147(void) ...@@ -92,7 +91,6 @@ void __init config_mvme147(void)
mach_init_IRQ = mvme147_init_IRQ; mach_init_IRQ = mvme147_init_IRQ;
arch_gettimeoffset = mvme147_gettimeoffset; arch_gettimeoffset = mvme147_gettimeoffset;
mach_hwclk = mvme147_hwclk; mach_hwclk = mvme147_hwclk;
mach_set_clock_mmss = mvme147_set_clock_mmss;
mach_reset = mvme147_reset; mach_reset = mvme147_reset;
mach_get_model = mvme147_get_model; mach_get_model = mvme147_get_model;
...@@ -164,8 +162,3 @@ int mvme147_hwclk(int op, struct rtc_time *t) ...@@ -164,8 +162,3 @@ int mvme147_hwclk(int op, struct rtc_time *t)
} }
return 0; return 0;
} }
int mvme147_set_clock_mmss (unsigned long nowtime)
{
return 0;
}
...@@ -46,7 +46,6 @@ static void mvme16x_get_model(char *model); ...@@ -46,7 +46,6 @@ static void mvme16x_get_model(char *model);
extern void mvme16x_sched_init(irq_handler_t handler); extern void mvme16x_sched_init(irq_handler_t handler);
extern u32 mvme16x_gettimeoffset(void); extern u32 mvme16x_gettimeoffset(void);
extern int mvme16x_hwclk (int, struct rtc_time *); extern int mvme16x_hwclk (int, struct rtc_time *);
extern int mvme16x_set_clock_mmss (unsigned long);
extern void mvme16x_reset (void); extern void mvme16x_reset (void);
int bcd2int (unsigned char b); int bcd2int (unsigned char b);
...@@ -280,7 +279,6 @@ void __init config_mvme16x(void) ...@@ -280,7 +279,6 @@ void __init config_mvme16x(void)
mach_init_IRQ = mvme16x_init_IRQ; mach_init_IRQ = mvme16x_init_IRQ;
arch_gettimeoffset = mvme16x_gettimeoffset; arch_gettimeoffset = mvme16x_gettimeoffset;
mach_hwclk = mvme16x_hwclk; mach_hwclk = mvme16x_hwclk;
mach_set_clock_mmss = mvme16x_set_clock_mmss;
mach_reset = mvme16x_reset; mach_reset = mvme16x_reset;
mach_get_model = mvme16x_get_model; mach_get_model = mvme16x_get_model;
mach_get_hardware_list = mvme16x_get_hardware_list; mach_get_hardware_list = mvme16x_get_hardware_list;
...@@ -411,9 +409,3 @@ int mvme16x_hwclk(int op, struct rtc_time *t) ...@@ -411,9 +409,3 @@ int mvme16x_hwclk(int op, struct rtc_time *t)
} }
return 0; return 0;
} }
int mvme16x_set_clock_mmss (unsigned long nowtime)
{
return 0;
}
...@@ -43,7 +43,6 @@ extern void q40_sched_init(irq_handler_t handler); ...@@ -43,7 +43,6 @@ extern void q40_sched_init(irq_handler_t handler);
static u32 q40_gettimeoffset(void); static u32 q40_gettimeoffset(void);
static int q40_hwclk(int, struct rtc_time *); static int q40_hwclk(int, struct rtc_time *);
static unsigned int q40_get_ss(void); static unsigned int q40_get_ss(void);
static int q40_set_clock_mmss(unsigned long);
static int q40_get_rtc_pll(struct rtc_pll_info *pll); static int q40_get_rtc_pll(struct rtc_pll_info *pll);
static int q40_set_rtc_pll(struct rtc_pll_info *pll); static int q40_set_rtc_pll(struct rtc_pll_info *pll);
...@@ -175,7 +174,6 @@ void __init config_q40(void) ...@@ -175,7 +174,6 @@ void __init config_q40(void)
mach_get_ss = q40_get_ss; mach_get_ss = q40_get_ss;
mach_get_rtc_pll = q40_get_rtc_pll; mach_get_rtc_pll = q40_get_rtc_pll;
mach_set_rtc_pll = q40_set_rtc_pll; mach_set_rtc_pll = q40_set_rtc_pll;
mach_set_clock_mmss = q40_set_clock_mmss;
mach_reset = q40_reset; mach_reset = q40_reset;
mach_get_model = q40_get_model; mach_get_model = q40_get_model;
...@@ -267,34 +265,6 @@ static unsigned int q40_get_ss(void) ...@@ -267,34 +265,6 @@ static unsigned int q40_get_ss(void)
return bcd2bin(Q40_RTC_SECS); return bcd2bin(Q40_RTC_SECS);
} }
/*
* Set the minutes and seconds from seconds value 'nowtime'. Fail if
* clock is out by > 30 minutes. Logic lifted from atari code.
*/
static int q40_set_clock_mmss(unsigned long nowtime)
{
int retval = 0;
short real_seconds = nowtime % 60, real_minutes = (nowtime / 60) % 60;
int rtc_minutes;
rtc_minutes = bcd2bin(Q40_RTC_MINS);
if ((rtc_minutes < real_minutes ?
real_minutes - rtc_minutes :
rtc_minutes - real_minutes) < 30) {
Q40_RTC_CTRL |= Q40_RTC_WRITE;
Q40_RTC_MINS = bin2bcd(real_minutes);
Q40_RTC_SECS = bin2bcd(real_seconds);
Q40_RTC_CTRL &= ~(Q40_RTC_WRITE);
} else
retval = -1;
return retval;
}
/* get and set PLL calibration of RTC clock */ /* get and set PLL calibration of RTC clock */
#define Q40_RTC_PLL_MASK ((1<<5)-1) #define Q40_RTC_PLL_MASK ((1<<5)-1)
#define Q40_RTC_PLL_SIGN (1<<5) #define Q40_RTC_PLL_SIGN (1<<5)
......
...@@ -123,10 +123,6 @@ static void __init sun3_bootmem_alloc(unsigned long memory_start, ...@@ -123,10 +123,6 @@ static void __init sun3_bootmem_alloc(unsigned long memory_start,
availmem = memory_start; availmem = memory_start;
m68k_setup_node(0); m68k_setup_node(0);
availmem += init_bootmem(start_page, num_pages);
availmem = (availmem + (PAGE_SIZE-1)) & PAGE_MASK;
free_bootmem(__pa(availmem), memory_end - (availmem));
} }
......
...@@ -57,8 +57,8 @@ MODULE_LICENSE("GPL v2"); ...@@ -57,8 +57,8 @@ MODULE_LICENSE("GPL v2");
#define HIL_DATA 0x1 #define HIL_DATA 0x1
#define HIL_CMD 0x3 #define HIL_CMD 0x3
#define HIL_IRQ 2 #define HIL_IRQ 2
#define hil_readb(p) readb(p) #define hil_readb(p) readb((const volatile void __iomem *)(p))
#define hil_writeb(v,p) writeb((v),(p)) #define hil_writeb(v, p) writeb((v), (volatile void __iomem *)(p))
#else #else
#error "HIL is not supported on this platform" #error "HIL is not supported on this platform"
......
...@@ -153,9 +153,6 @@ static void dayna_block_input(struct net_device *dev, int count, ...@@ -153,9 +153,6 @@ static void dayna_block_input(struct net_device *dev, int count,
static void dayna_block_output(struct net_device *dev, int count, static void dayna_block_output(struct net_device *dev, int count,
const unsigned char *buf, int start_page); const unsigned char *buf, int start_page);
#define memcpy_fromio(a, b, c) memcpy((a), (void *)(b), (c))
#define memcpy_toio(a, b, c) memcpy((void *)(a), (b), (c))
#define memcmp_withio(a, b, c) memcmp((a), (void *)(b), (c)) #define memcmp_withio(a, b, c) memcmp((a), (void *)(b), (c))
/* Slow Sane (16-bit chunk memory read/write) Cabletron uses this */ /* Slow Sane (16-bit chunk memory read/write) Cabletron uses this */
...@@ -239,7 +236,7 @@ static enum mac8390_access mac8390_testio(unsigned long membase) ...@@ -239,7 +236,7 @@ static enum mac8390_access mac8390_testio(unsigned long membase)
unsigned long outdata = 0xA5A0B5B0; unsigned long outdata = 0xA5A0B5B0;
unsigned long indata = 0x00000000; unsigned long indata = 0x00000000;
/* Try writing 32 bits */ /* Try writing 32 bits */
memcpy_toio(membase, &outdata, 4); memcpy_toio((void __iomem *)membase, &outdata, 4);
/* Now compare them */ /* Now compare them */
if (memcmp_withio(&outdata, membase, 4) == 0) if (memcmp_withio(&outdata, membase, 4) == 0)
return ACCESS_32; return ACCESS_32;
...@@ -711,7 +708,7 @@ static void sane_get_8390_hdr(struct net_device *dev, ...@@ -711,7 +708,7 @@ static void sane_get_8390_hdr(struct net_device *dev,
struct e8390_pkt_hdr *hdr, int ring_page) struct e8390_pkt_hdr *hdr, int ring_page)
{ {
unsigned long hdr_start = (ring_page - WD_START_PG)<<8; unsigned long hdr_start = (ring_page - WD_START_PG)<<8;
memcpy_fromio(hdr, dev->mem_start + hdr_start, 4); memcpy_fromio(hdr, (void __iomem *)dev->mem_start + hdr_start, 4);
/* Fix endianness */ /* Fix endianness */
hdr->count = swab16(hdr->count); hdr->count = swab16(hdr->count);
} }
...@@ -725,13 +722,16 @@ static void sane_block_input(struct net_device *dev, int count, ...@@ -725,13 +722,16 @@ static void sane_block_input(struct net_device *dev, int count,
if (xfer_start + count > ei_status.rmem_end) { if (xfer_start + count > ei_status.rmem_end) {
/* We must wrap the input move. */ /* We must wrap the input move. */
int semi_count = ei_status.rmem_end - xfer_start; int semi_count = ei_status.rmem_end - xfer_start;
memcpy_fromio(skb->data, dev->mem_start + xfer_base, memcpy_fromio(skb->data,
(void __iomem *)dev->mem_start + xfer_base,
semi_count); semi_count);
count -= semi_count; count -= semi_count;
memcpy_fromio(skb->data + semi_count, ei_status.rmem_start, memcpy_fromio(skb->data + semi_count,
count); (void __iomem *)ei_status.rmem_start, count);
} else { } else {
memcpy_fromio(skb->data, dev->mem_start + xfer_base, count); memcpy_fromio(skb->data,
(void __iomem *)dev->mem_start + xfer_base,
count);
} }
} }
...@@ -740,7 +740,7 @@ static void sane_block_output(struct net_device *dev, int count, ...@@ -740,7 +740,7 @@ static void sane_block_output(struct net_device *dev, int count,
{ {
long shmem = (start_page - WD_START_PG)<<8; long shmem = (start_page - WD_START_PG)<<8;
memcpy_toio(dev->mem_start + shmem, buf, count); memcpy_toio((void __iomem *)dev->mem_start + shmem, buf, count);
} }
/* dayna block input/output */ /* dayna block input/output */
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
// Copyright (C) 2017 Finn Thain // Copyright (C) 2017 Finn Thain
#include <linux/device.h> #include <linux/device.h>
#include <linux/dma-mapping.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/nubus.h> #include <linux/nubus.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
...@@ -93,6 +94,8 @@ int nubus_device_register(struct nubus_board *board) ...@@ -93,6 +94,8 @@ int nubus_device_register(struct nubus_board *board)
board->dev.release = nubus_device_release; board->dev.release = nubus_device_release;
board->dev.bus = &nubus_bus_type; board->dev.bus = &nubus_bus_type;
dev_set_name(&board->dev, "slot.%X", board->slot); dev_set_name(&board->dev, "slot.%X", board->slot);
board->dev.dma_mask = &board->dev.coherent_dma_mask;
dma_set_mask(&board->dev, DMA_BIT_MASK(32));
return device_register(&board->dev); return device_register(&board->dev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment