Skip to content

L
linux
Commit dbcda58a authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

Pull m68k updates from Geert Uytterhoeven:

 - ioremap() cleanups

 - defconfig updates

 - small fixes and cleanups

* tag 'm68k-for-v5.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Remove ioremap_fullcache()
  m68k: Simplify ioremap_nocache()
  m68k: defconfig: Update defconfigs for v5.3-rc2
  m68k: atari: Rename shifter to shifter_st to avoid conflict
  m68k: Prevent some compiler warnings in Coldfire builds
  m68k: mac: Revisit floppy disc controller base addresses
parents e77fafe9 0f1979b4
Show whitespace changes
Inline Side-by-side
Showing with 223 additions and 156 deletions
arch/m68k/atari/config.c
View file @ dbcda58a
...@@ -246,9 +246,9 @@ void __init config_atari(void) ...@@ -246,9 +246,9 @@ void __init config_atari(void)
} else if (hwreg_present(tt_palette)) { } else if (hwreg_present(tt_palette)) {
ATARIHW_SET(TT_SHIFTER); ATARIHW_SET(TT_SHIFTER);
pr_cont(" TT_SHIFTER"); pr_cont(" TT_SHIFTER");
} else if (hwreg_present(&shifter.bas_hi)) { } else if (hwreg_present(&shifter_st.bas_hi)) {
if (hwreg_present(&shifter.bas_lo) && if (hwreg_present(&shifter_st.bas_lo) &&
(shifter.bas_lo = 0x0aau, shifter.bas_lo == 0x0aau)) { (shifter_st.bas_lo = 0x0aau, shifter_st.bas_lo == 0x0aau)) {
ATARIHW_SET(EXTD_SHIFTER); ATARIHW_SET(EXTD_SHIFTER);
pr_cont(" EXTD_SHIFTER"); pr_cont(" EXTD_SHIFTER");
} else { } else {
......
arch/m68k/configs/amiga_defconfig
View file @ dbcda58a
...@@ -125,6 +125,7 @@ CONFIG_NFT_XFRM=m ...@@ -125,6 +125,7 @@ CONFIG_NFT_XFRM=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
CONFIG_NFT_OSF=m CONFIG_NFT_OSF=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_SYNPROXY=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
...@@ -250,9 +251,11 @@ CONFIG_IP6_NF_RAW=m ...@@ -250,9 +251,11 @@ CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_NAT=m 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=m
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_NF_CONNTRACK_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m CONFIG_BRIDGE_EBT_T_FILTER=m
...@@ -330,7 +333,6 @@ CONFIG_RAID_ATTRS=m ...@@ -330,7 +333,6 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_ST=m
CONFIG_CHR_DEV_OSST=m
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SG=m
...@@ -450,7 +452,6 @@ CONFIG_RTC_DRV_RP5C01=m ...@@ -450,7 +452,6 @@ CONFIG_RTC_DRV_RP5C01=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
# CONFIG_VALIDATE_FS_PARSER is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -573,6 +574,7 @@ CONFIG_CRYPTO_KEYWRAP=m ...@@ -573,6 +574,7 @@ CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ADIANTUM=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_XXHASH=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
...@@ -582,8 +584,10 @@ CONFIG_CRYPTO_SHA3=m ...@@ -582,8 +584,10 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_ARC4=m
CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST5=m
...@@ -618,6 +622,7 @@ CONFIG_MAGIC_SYSRQ=y ...@@ -618,6 +622,7 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -636,6 +641,7 @@ CONFIG_TEST_IDA=m ...@@ -636,6 +641,7 @@ CONFIG_TEST_IDA=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
...@@ -644,4 +650,5 @@ CONFIG_TEST_STATIC_KEYS=m ...@@ -644,4 +650,5 @@ CONFIG_TEST_STATIC_KEYS=m
CONFIG_TEST_KMOD=m CONFIG_TEST_KMOD=m
CONFIG_TEST_MEMCAT_P=m CONFIG_TEST_MEMCAT_P=m
CONFIG_TEST_STACKINIT=m CONFIG_TEST_STACKINIT=m
CONFIG_TEST_MEMINIT=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
arch/m68k/configs/apollo_defconfig
View file @ dbcda58a
...@@ -121,6 +121,7 @@ CONFIG_NFT_XFRM=m ...@@ -121,6 +121,7 @@ CONFIG_NFT_XFRM=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
CONFIG_NFT_OSF=m CONFIG_NFT_OSF=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_SYNPROXY=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
...@@ -246,9 +247,11 @@ CONFIG_IP6_NF_RAW=m ...@@ -246,9 +247,11 @@ CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_NAT=m 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=m
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_NF_CONNTRACK_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m CONFIG_BRIDGE_EBT_T_FILTER=m
...@@ -315,7 +318,6 @@ CONFIG_RAID_ATTRS=m ...@@ -315,7 +318,6 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_ST=m
CONFIG_CHR_DEV_OSST=m
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SG=m
...@@ -410,7 +412,6 @@ CONFIG_RTC_DRV_GENERIC=m ...@@ -410,7 +412,6 @@ CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
# CONFIG_VALIDATE_FS_PARSER is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -533,6 +534,7 @@ CONFIG_CRYPTO_KEYWRAP=m ...@@ -533,6 +534,7 @@ CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ADIANTUM=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_XXHASH=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
...@@ -542,8 +544,10 @@ CONFIG_CRYPTO_SHA3=m ...@@ -542,8 +544,10 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_ARC4=m
CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST5=m
...@@ -578,6 +582,7 @@ CONFIG_MAGIC_SYSRQ=y ...@@ -578,6 +582,7 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -596,6 +601,7 @@ CONFIG_TEST_IDA=m ...@@ -596,6 +601,7 @@ CONFIG_TEST_IDA=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
...@@ -604,4 +610,5 @@ CONFIG_TEST_STATIC_KEYS=m ...@@ -604,4 +610,5 @@ CONFIG_TEST_STATIC_KEYS=m
CONFIG_TEST_KMOD=m CONFIG_TEST_KMOD=m
CONFIG_TEST_MEMCAT_P=m CONFIG_TEST_MEMCAT_P=m
CONFIG_TEST_STACKINIT=m CONFIG_TEST_STACKINIT=m
CONFIG_TEST_MEMINIT=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
arch/m68k/configs/atari_defconfig
View file @ dbcda58a
...@@ -128,6 +128,7 @@ CONFIG_NFT_XFRM=m ...@@ -128,6 +128,7 @@ CONFIG_NFT_XFRM=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
CONFIG_NFT_OSF=m CONFIG_NFT_OSF=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_SYNPROXY=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
...@@ -253,9 +254,11 @@ CONFIG_IP6_NF_RAW=m ...@@ -253,9 +254,11 @@ CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_NAT=m 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=m
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_NF_CONNTRACK_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m CONFIG_BRIDGE_EBT_T_FILTER=m
...@@ -330,7 +333,6 @@ CONFIG_RAID_ATTRS=m ...@@ -330,7 +333,6 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_ST=m
CONFIG_CHR_DEV_OSST=m
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SG=m
...@@ -432,7 +434,6 @@ CONFIG_RTC_DRV_GENERIC=m ...@@ -432,7 +434,6 @@ CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
# CONFIG_VALIDATE_FS_PARSER is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -555,6 +556,7 @@ CONFIG_CRYPTO_KEYWRAP=m ...@@ -555,6 +556,7 @@ CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ADIANTUM=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_XXHASH=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
...@@ -564,8 +566,10 @@ CONFIG_CRYPTO_SHA3=m ...@@ -564,8 +566,10 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_ARC4=m
CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST5=m
...@@ -600,6 +604,7 @@ CONFIG_MAGIC_SYSRQ=y ...@@ -600,6 +604,7 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -618,6 +623,7 @@ CONFIG_TEST_IDA=m ...@@ -618,6 +623,7 @@ CONFIG_TEST_IDA=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
...@@ -626,4 +632,5 @@ CONFIG_TEST_STATIC_KEYS=m ...@@ -626,4 +632,5 @@ CONFIG_TEST_STATIC_KEYS=m
CONFIG_TEST_KMOD=m CONFIG_TEST_KMOD=m
CONFIG_TEST_MEMCAT_P=m CONFIG_TEST_MEMCAT_P=m
CONFIG_TEST_STACKINIT=m CONFIG_TEST_STACKINIT=m
CONFIG_TEST_MEMINIT=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
arch/m68k/configs/bvme6000_defconfig
View file @ dbcda58a
...@@ -118,6 +118,7 @@ CONFIG_NFT_XFRM=m ...@@ -118,6 +118,7 @@ CONFIG_NFT_XFRM=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
CONFIG_NFT_OSF=m CONFIG_NFT_OSF=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_SYNPROXY=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
...@@ -243,9 +244,11 @@ CONFIG_IP6_NF_RAW=m ...@@ -243,9 +244,11 @@ CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_NAT=m 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=m
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_NF_CONNTRACK_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m CONFIG_BRIDGE_EBT_T_FILTER=m
...@@ -312,7 +315,6 @@ CONFIG_RAID_ATTRS=m ...@@ -312,7 +315,6 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_ST=m
CONFIG_CHR_DEV_OSST=m
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SG=m
...@@ -403,7 +405,6 @@ CONFIG_RTC_DRV_GENERIC=m ...@@ -403,7 +405,6 @@ CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
# CONFIG_VALIDATE_FS_PARSER is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -526,6 +527,7 @@ CONFIG_CRYPTO_KEYWRAP=m ...@@ -526,6 +527,7 @@ CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ADIANTUM=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_XXHASH=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
...@@ -535,8 +537,10 @@ CONFIG_CRYPTO_SHA3=m ...@@ -535,8 +537,10 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_ARC4=m
CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST5=m
...@@ -571,6 +575,7 @@ CONFIG_MAGIC_SYSRQ=y ...@@ -571,6 +575,7 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -589,6 +594,7 @@ CONFIG_TEST_IDA=m ...@@ -589,6 +594,7 @@ CONFIG_TEST_IDA=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
...@@ -597,4 +603,5 @@ CONFIG_TEST_STATIC_KEYS=m ...@@ -597,4 +603,5 @@ CONFIG_TEST_STATIC_KEYS=m
CONFIG_TEST_KMOD=m CONFIG_TEST_KMOD=m
CONFIG_TEST_MEMCAT_P=m CONFIG_TEST_MEMCAT_P=m
CONFIG_TEST_STACKINIT=m CONFIG_TEST_STACKINIT=m
CONFIG_TEST_MEMINIT=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
arch/m68k/configs/hp300_defconfig
View file @ dbcda58a
...@@ -120,6 +120,7 @@ CONFIG_NFT_XFRM=m ...@@ -120,6 +120,7 @@ CONFIG_NFT_XFRM=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
CONFIG_NFT_OSF=m CONFIG_NFT_OSF=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_SYNPROXY=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
...@@ -245,9 +246,11 @@ CONFIG_IP6_NF_RAW=m ...@@ -245,9 +246,11 @@ CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_NAT=m 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=m
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_NF_CONNTRACK_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m CONFIG_BRIDGE_EBT_T_FILTER=m
...@@ -314,7 +317,6 @@ CONFIG_RAID_ATTRS=m ...@@ -314,7 +317,6 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_ST=m
CONFIG_CHR_DEV_OSST=m
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SG=m
...@@ -412,7 +414,6 @@ CONFIG_RTC_DRV_GENERIC=m ...@@ -412,7 +414,6 @@ CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
# CONFIG_VALIDATE_FS_PARSER is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -535,6 +536,7 @@ CONFIG_CRYPTO_KEYWRAP=m ...@@ -535,6 +536,7 @@ CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ADIANTUM=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_XXHASH=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
...@@ -544,8 +546,10 @@ CONFIG_CRYPTO_SHA3=m ...@@ -544,8 +546,10 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_ARC4=m
CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST5=m
...@@ -580,6 +584,7 @@ CONFIG_MAGIC_SYSRQ=y ...@@ -580,6 +584,7 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -598,6 +603,7 @@ CONFIG_TEST_IDA=m ...@@ -598,6 +603,7 @@ CONFIG_TEST_IDA=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
...@@ -606,4 +612,5 @@ CONFIG_TEST_STATIC_KEYS=m ...@@ -606,4 +612,5 @@ CONFIG_TEST_STATIC_KEYS=m
CONFIG_TEST_KMOD=m CONFIG_TEST_KMOD=m
CONFIG_TEST_MEMCAT_P=m CONFIG_TEST_MEMCAT_P=m
CONFIG_TEST_STACKINIT=m CONFIG_TEST_STACKINIT=m
CONFIG_TEST_MEMINIT=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
arch/m68k/configs/mac_defconfig
View file @ dbcda58a
...@@ -119,6 +119,7 @@ CONFIG_NFT_XFRM=m ...@@ -119,6 +119,7 @@ CONFIG_NFT_XFRM=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
CONFIG_NFT_OSF=m CONFIG_NFT_OSF=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_SYNPROXY=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
...@@ -244,9 +245,11 @@ CONFIG_IP6_NF_RAW=m ...@@ -244,9 +245,11 @@ CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_NAT=m 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=m
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_NF_CONNTRACK_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m CONFIG_BRIDGE_EBT_T_FILTER=m
...@@ -321,7 +324,6 @@ CONFIG_RAID_ATTRS=m ...@@ -321,7 +324,6 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_ST=m
CONFIG_CHR_DEV_OSST=m
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SG=m
...@@ -434,7 +436,6 @@ CONFIG_RTC_DRV_GENERIC=m ...@@ -434,7 +436,6 @@ CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
# CONFIG_VALIDATE_FS_PARSER is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -557,6 +558,7 @@ CONFIG_CRYPTO_KEYWRAP=m ...@@ -557,6 +558,7 @@ CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ADIANTUM=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_XXHASH=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
...@@ -566,8 +568,10 @@ CONFIG_CRYPTO_SHA3=m ...@@ -566,8 +568,10 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_ARC4=m
CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST5=m
...@@ -602,6 +606,7 @@ CONFIG_MAGIC_SYSRQ=y ...@@ -602,6 +606,7 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -620,6 +625,7 @@ CONFIG_TEST_IDA=m ...@@ -620,6 +625,7 @@ CONFIG_TEST_IDA=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
...@@ -628,4 +634,5 @@ CONFIG_TEST_STATIC_KEYS=m ...@@ -628,4 +634,5 @@ CONFIG_TEST_STATIC_KEYS=m
CONFIG_TEST_KMOD=m CONFIG_TEST_KMOD=m
CONFIG_TEST_MEMCAT_P=m CONFIG_TEST_MEMCAT_P=m
CONFIG_TEST_STACKINIT=m CONFIG_TEST_STACKINIT=m
CONFIG_TEST_MEMINIT=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
arch/m68k/configs/multi_defconfig
View file @ dbcda58a
...@@ -139,6 +139,7 @@ CONFIG_NFT_XFRM=m ...@@ -139,6 +139,7 @@ CONFIG_NFT_XFRM=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
CONFIG_NFT_OSF=m CONFIG_NFT_OSF=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_SYNPROXY=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
...@@ -264,9 +265,11 @@ CONFIG_IP6_NF_RAW=m ...@@ -264,9 +265,11 @@ CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_NAT=m 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=m
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_NF_CONNTRACK_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m CONFIG_BRIDGE_EBT_T_FILTER=m
...@@ -354,7 +357,6 @@ CONFIG_RAID_ATTRS=m ...@@ -354,7 +357,6 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_ST=m
CONFIG_CHR_DEV_OSST=m
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SG=m
...@@ -516,7 +518,6 @@ CONFIG_RTC_DRV_GENERIC=m ...@@ -516,7 +518,6 @@ CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
# CONFIG_VALIDATE_FS_PARSER is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -639,6 +640,7 @@ CONFIG_CRYPTO_KEYWRAP=m ...@@ -639,6 +640,7 @@ CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ADIANTUM=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_XXHASH=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
...@@ -648,8 +650,10 @@ CONFIG_CRYPTO_SHA3=m ...@@ -648,8 +650,10 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_ARC4=m
CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST5=m
...@@ -684,6 +688,7 @@ CONFIG_MAGIC_SYSRQ=y ...@@ -684,6 +688,7 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -702,6 +707,7 @@ CONFIG_TEST_IDA=m ...@@ -702,6 +707,7 @@ CONFIG_TEST_IDA=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
...@@ -710,4 +716,5 @@ CONFIG_TEST_STATIC_KEYS=m ...@@ -710,4 +716,5 @@ CONFIG_TEST_STATIC_KEYS=m
CONFIG_TEST_KMOD=m CONFIG_TEST_KMOD=m
CONFIG_TEST_MEMCAT_P=m CONFIG_TEST_MEMCAT_P=m
CONFIG_TEST_STACKINIT=m CONFIG_TEST_STACKINIT=m
CONFIG_TEST_MEMINIT=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
arch/m68k/configs/mvme147_defconfig
View file @ dbcda58a
...@@ -117,6 +117,7 @@ CONFIG_NFT_XFRM=m ...@@ -117,6 +117,7 @@ CONFIG_NFT_XFRM=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
CONFIG_NFT_OSF=m CONFIG_NFT_OSF=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_SYNPROXY=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
...@@ -242,9 +243,11 @@ CONFIG_IP6_NF_RAW=m ...@@ -242,9 +243,11 @@ CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_NAT=m 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=m
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_NF_CONNTRACK_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m CONFIG_BRIDGE_EBT_T_FILTER=m
...@@ -311,7 +314,6 @@ CONFIG_RAID_ATTRS=m ...@@ -311,7 +314,6 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_ST=m
CONFIG_CHR_DEV_OSST=m
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SG=m
...@@ -402,7 +404,6 @@ CONFIG_RTC_DRV_GENERIC=m ...@@ -402,7 +404,6 @@ CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
# CONFIG_VALIDATE_FS_PARSER is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -525,6 +526,7 @@ CONFIG_CRYPTO_KEYWRAP=m ...@@ -525,6 +526,7 @@ CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ADIANTUM=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_XXHASH=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
...@@ -534,8 +536,10 @@ CONFIG_CRYPTO_SHA3=m ...@@ -534,8 +536,10 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_ARC4=m
CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST5=m
...@@ -570,6 +574,7 @@ CONFIG_MAGIC_SYSRQ=y ...@@ -570,6 +574,7 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -588,6 +593,7 @@ CONFIG_TEST_IDA=m ...@@ -588,6 +593,7 @@ CONFIG_TEST_IDA=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
...@@ -596,4 +602,5 @@ CONFIG_TEST_STATIC_KEYS=m ...@@ -596,4 +602,5 @@ CONFIG_TEST_STATIC_KEYS=m
CONFIG_TEST_KMOD=m CONFIG_TEST_KMOD=m
CONFIG_TEST_MEMCAT_P=m CONFIG_TEST_MEMCAT_P=m
CONFIG_TEST_STACKINIT=m CONFIG_TEST_STACKINIT=m
CONFIG_TEST_MEMINIT=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
arch/m68k/configs/mvme16x_defconfig
View file @ dbcda58a
...@@ -118,6 +118,7 @@ CONFIG_NFT_XFRM=m ...@@ -118,6 +118,7 @@ CONFIG_NFT_XFRM=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
CONFIG_NFT_OSF=m CONFIG_NFT_OSF=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_SYNPROXY=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
...@@ -243,9 +244,11 @@ CONFIG_IP6_NF_RAW=m ...@@ -243,9 +244,11 @@ CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_NAT=m 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=m
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_NF_CONNTRACK_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m CONFIG_BRIDGE_EBT_T_FILTER=m
...@@ -312,7 +315,6 @@ CONFIG_RAID_ATTRS=m ...@@ -312,7 +315,6 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_ST=m
CONFIG_CHR_DEV_OSST=m
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SG=m
...@@ -403,7 +405,6 @@ CONFIG_RTC_DRV_GENERIC=m ...@@ -403,7 +405,6 @@ CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
# CONFIG_VALIDATE_FS_PARSER is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -526,6 +527,7 @@ CONFIG_CRYPTO_KEYWRAP=m ...@@ -526,6 +527,7 @@ CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ADIANTUM=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_XXHASH=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
...@@ -535,8 +537,10 @@ CONFIG_CRYPTO_SHA3=m ...@@ -535,8 +537,10 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_ARC4=m
CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST5=m
...@@ -571,6 +575,7 @@ CONFIG_MAGIC_SYSRQ=y ...@@ -571,6 +575,7 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -589,6 +594,7 @@ CONFIG_TEST_IDA=m ...@@ -589,6 +594,7 @@ CONFIG_TEST_IDA=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
...@@ -597,4 +603,5 @@ CONFIG_TEST_STATIC_KEYS=m ...@@ -597,4 +603,5 @@ CONFIG_TEST_STATIC_KEYS=m
CONFIG_TEST_KMOD=m CONFIG_TEST_KMOD=m
CONFIG_TEST_MEMCAT_P=m CONFIG_TEST_MEMCAT_P=m
CONFIG_TEST_STACKINIT=m CONFIG_TEST_STACKINIT=m
CONFIG_TEST_MEMINIT=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
arch/m68k/configs/q40_defconfig
View file @ dbcda58a
...@@ -119,6 +119,7 @@ CONFIG_NFT_XFRM=m ...@@ -119,6 +119,7 @@ CONFIG_NFT_XFRM=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
CONFIG_NFT_OSF=m CONFIG_NFT_OSF=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_SYNPROXY=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
...@@ -244,9 +245,11 @@ CONFIG_IP6_NF_RAW=m ...@@ -244,9 +245,11 @@ CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_NAT=m 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=m
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_NF_CONNTRACK_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m CONFIG_BRIDGE_EBT_T_FILTER=m
...@@ -320,7 +323,6 @@ CONFIG_RAID_ATTRS=m ...@@ -320,7 +323,6 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_ST=m
CONFIG_CHR_DEV_OSST=m
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SG=m
...@@ -421,7 +423,6 @@ CONFIG_RTC_DRV_GENERIC=m ...@@ -421,7 +423,6 @@ CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
# CONFIG_VALIDATE_FS_PARSER is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -544,6 +545,7 @@ CONFIG_CRYPTO_KEYWRAP=m ...@@ -544,6 +545,7 @@ CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ADIANTUM=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_XXHASH=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
...@@ -553,8 +555,10 @@ CONFIG_CRYPTO_SHA3=m ...@@ -553,8 +555,10 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_ARC4=m
CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST5=m
...@@ -589,6 +593,7 @@ CONFIG_MAGIC_SYSRQ=y ...@@ -589,6 +593,7 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -607,6 +612,7 @@ CONFIG_TEST_IDA=m ...@@ -607,6 +612,7 @@ CONFIG_TEST_IDA=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
...@@ -615,4 +621,5 @@ CONFIG_TEST_STATIC_KEYS=m ...@@ -615,4 +621,5 @@ CONFIG_TEST_STATIC_KEYS=m
CONFIG_TEST_KMOD=m CONFIG_TEST_KMOD=m
CONFIG_TEST_MEMCAT_P=m CONFIG_TEST_MEMCAT_P=m
CONFIG_TEST_STACKINIT=m CONFIG_TEST_STACKINIT=m
CONFIG_TEST_MEMINIT=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
arch/m68k/configs/sun3_defconfig
View file @ dbcda58a
...@@ -115,6 +115,7 @@ CONFIG_NFT_XFRM=m ...@@ -115,6 +115,7 @@ CONFIG_NFT_XFRM=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
CONFIG_NFT_OSF=m CONFIG_NFT_OSF=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_SYNPROXY=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
...@@ -240,9 +241,11 @@ CONFIG_IP6_NF_RAW=m ...@@ -240,9 +241,11 @@ CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_NAT=m 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=m
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_NF_CONNTRACK_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m CONFIG_BRIDGE_EBT_T_FILTER=m
...@@ -309,7 +312,6 @@ CONFIG_RAID_ATTRS=m ...@@ -309,7 +312,6 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_ST=m
CONFIG_CHR_DEV_OSST=m
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SG=m
...@@ -405,7 +407,6 @@ CONFIG_RTC_DRV_GENERIC=m ...@@ -405,7 +407,6 @@ CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
# CONFIG_VALIDATE_FS_PARSER is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -528,6 +529,7 @@ CONFIG_CRYPTO_KEYWRAP=m ...@@ -528,6 +529,7 @@ CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ADIANTUM=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_XXHASH=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
...@@ -537,8 +539,10 @@ CONFIG_CRYPTO_SHA3=m ...@@ -537,8 +539,10 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_ARC4=m
CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST5=m
...@@ -573,6 +577,7 @@ CONFIG_MAGIC_SYSRQ=y ...@@ -573,6 +577,7 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -591,6 +596,7 @@ CONFIG_TEST_IDA=m ...@@ -591,6 +596,7 @@ CONFIG_TEST_IDA=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
...@@ -599,3 +605,4 @@ CONFIG_TEST_STATIC_KEYS=m ...@@ -599,3 +605,4 @@ CONFIG_TEST_STATIC_KEYS=m
CONFIG_TEST_KMOD=m CONFIG_TEST_KMOD=m
CONFIG_TEST_MEMCAT_P=m CONFIG_TEST_MEMCAT_P=m
CONFIG_TEST_STACKINIT=m CONFIG_TEST_STACKINIT=m
CONFIG_TEST_MEMINIT=m
arch/m68k/configs/sun3x_defconfig
View file @ dbcda58a
...@@ -115,6 +115,7 @@ CONFIG_NFT_XFRM=m ...@@ -115,6 +115,7 @@ CONFIG_NFT_XFRM=m
CONFIG_NFT_SOCKET=m CONFIG_NFT_SOCKET=m
CONFIG_NFT_OSF=m CONFIG_NFT_OSF=m
CONFIG_NFT_TPROXY=m CONFIG_NFT_TPROXY=m
CONFIG_NFT_SYNPROXY=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
...@@ -240,9 +241,11 @@ CONFIG_IP6_NF_RAW=m ...@@ -240,9 +241,11 @@ CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_NAT=m 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=m
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_NF_CONNTRACK_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m CONFIG_BRIDGE_EBT_T_FILTER=m
...@@ -309,7 +312,6 @@ CONFIG_RAID_ATTRS=m ...@@ -309,7 +312,6 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_ST=m
CONFIG_CHR_DEV_OSST=m
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SG=m
...@@ -404,7 +406,6 @@ CONFIG_RTC_DRV_GENERIC=m ...@@ -404,7 +406,6 @@ CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
# CONFIG_VALIDATE_FS_PARSER is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m CONFIG_JFS_FS=m
...@@ -527,6 +528,7 @@ CONFIG_CRYPTO_KEYWRAP=m ...@@ -527,6 +528,7 @@ CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ADIANTUM=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_XXHASH=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
...@@ -536,8 +538,10 @@ CONFIG_CRYPTO_SHA3=m ...@@ -536,8 +538,10 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_ARC4=m
CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST5=m
...@@ -572,6 +576,7 @@ CONFIG_MAGIC_SYSRQ=y ...@@ -572,6 +576,7 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -590,6 +595,7 @@ CONFIG_TEST_IDA=m ...@@ -590,6 +595,7 @@ CONFIG_TEST_IDA=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
...@@ -598,4 +604,5 @@ CONFIG_TEST_STATIC_KEYS=m ...@@ -598,4 +604,5 @@ CONFIG_TEST_STATIC_KEYS=m
CONFIG_TEST_KMOD=m CONFIG_TEST_KMOD=m
CONFIG_TEST_MEMCAT_P=m CONFIG_TEST_MEMCAT_P=m
CONFIG_TEST_STACKINIT=m CONFIG_TEST_STACKINIT=m
CONFIG_TEST_MEMINIT=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
arch/m68k/include/asm/atarihw.h
View file @ dbcda58a
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <asm/bootinfo-atari.h> #include <asm/bootinfo-atari.h>
#include <asm/raw_io.h>
#include <asm/kmap.h> #include <asm/kmap.h>
extern u_long atari_mch_cookie; extern u_long atari_mch_cookie;
...@@ -132,14 +131,6 @@ extern struct atari_hw_present atari_hw_present; ...@@ -132,14 +131,6 @@ extern struct atari_hw_present atari_hw_present;
*/ */
#define atari_readb raw_inb
#define atari_writeb raw_outb
#define atari_inb_p raw_inb
#define atari_outb_p raw_outb
#include <linux/mm.h> #include <linux/mm.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
...@@ -170,7 +161,7 @@ static inline void dma_cache_maintenance( unsigned long paddr, ...@@ -170,7 +161,7 @@ static inline void dma_cache_maintenance( unsigned long paddr,
#define TT_HIGH 6 #define TT_HIGH 6
#define SHF_BAS (0xffff8200) #define SHF_BAS (0xffff8200)
struct SHIFTER struct SHIFTER_ST
{ {
u_char pad1; u_char pad1;
u_char bas_hi; u_char bas_hi;
...@@ -187,7 +178,7 @@ struct SHIFTER ...@@ -187,7 +178,7 @@ struct SHIFTER
u_char pad7; u_char pad7;
u_char bas_lo; u_char bas_lo;
}; };
# define shifter ((*(volatile struct SHIFTER *)SHF_BAS)) # define shifter_st ((*(volatile struct SHIFTER_ST *)SHF_BAS))
#define SHF_FBAS (0xffff820e) #define SHF_FBAS (0xffff820e)
struct SHIFTER_F030 struct SHIFTER_F030
......
arch/m68k/include/asm/io_mm.h
View file @ dbcda58a
...@@ -29,7 +29,11 @@ ...@@ -29,7 +29,11 @@
#include <asm-generic/iomap.h> #include <asm-generic/iomap.h>
#ifdef CONFIG_ATARI #ifdef CONFIG_ATARI
#include <asm/atarihw.h> #define atari_readb raw_inb
#define atari_writeb raw_outb
#define atari_inb_p raw_inb
#define atari_outb_p raw_outb
#endif #endif
......
arch/m68k/include/asm/kmap.h
View file @ dbcda58a
...@@ -28,14 +28,8 @@ static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size) ...@@ -28,14 +28,8 @@ static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size)
return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
} }
#define ioremap_nocache ioremap_nocache #define ioremap_nocache ioremap
static inline void __iomem *ioremap_nocache(unsigned long physaddr, #define ioremap_uc ioremap
unsigned long size)
{
return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
}
#define ioremap_uc ioremap_nocache
#define ioremap_wt ioremap_wt #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)
...@@ -43,13 +37,6 @@ static inline void __iomem *ioremap_wt(unsigned long physaddr, ...@@ -43,13 +37,6 @@ static inline void __iomem *ioremap_wt(unsigned long physaddr,
return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); return __ioremap(physaddr, size, IOMAP_WRITETHROUGH);
} }
#define ioremap_fullcache ioremap_fullcache
static inline void __iomem *ioremap_fullcache(unsigned long physaddr,
unsigned long size)
{
return __ioremap(physaddr, size, IOMAP_FULL_CACHING);
}
#define memset_io memset_io #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)
......
arch/m68k/include/asm/macintosh.h
View file @ dbcda58a
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <asm/bootinfo-mac.h> #include <asm/bootinfo-mac.h>
...@@ -82,11 +83,11 @@ struct mac_model ...@@ -82,11 +83,11 @@ struct mac_model
#define MAC_EXP_PDS_NUBUS 3 /* Accepts PDS card and/or NuBus card(s) */ #define MAC_EXP_PDS_NUBUS 3 /* Accepts PDS card and/or NuBus card(s) */
#define MAC_EXP_PDS_COMM 4 /* Accepts PDS card or Comm Slot card */ #define MAC_EXP_PDS_COMM 4 /* Accepts PDS card or Comm Slot card */
#define MAC_FLOPPY_IWM 0 #define MAC_FLOPPY_UNSUPPORTED 0
#define MAC_FLOPPY_SWIM_ADDR1 1 #define MAC_FLOPPY_SWIM_IOP 1
#define MAC_FLOPPY_SWIM_ADDR2 2 #define MAC_FLOPPY_OLD 2
#define MAC_FLOPPY_SWIM_IOP 3 #define MAC_FLOPPY_QUADRA 3
#define MAC_FLOPPY_AV 4 #define MAC_FLOPPY_LC 4
extern struct mac_model *macintosh_config; extern struct mac_model *macintosh_config;
......
arch/m68k/mac/config.c
View file @ dbcda58a
...@@ -209,7 +209,7 @@ static struct mac_model mac_data_table[] = { ...@@ -209,7 +209,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_OLD, .scsi_type = MAC_SCSI_OLD,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_NUBUS, .expansion_type = MAC_EXP_NUBUS,
.floppy_type = MAC_FLOPPY_IWM, .floppy_type = MAC_FLOPPY_UNSUPPORTED, /* IWM */
}, },
/* /*
...@@ -224,7 +224,7 @@ static struct mac_model mac_data_table[] = { ...@@ -224,7 +224,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_OLD, .scsi_type = MAC_SCSI_OLD,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_NUBUS, .expansion_type = MAC_EXP_NUBUS,
.floppy_type = MAC_FLOPPY_IWM, .floppy_type = MAC_FLOPPY_UNSUPPORTED, /* IWM */
}, { }, {
.ident = MAC_MODEL_IIX, .ident = MAC_MODEL_IIX,
.name = "IIx", .name = "IIx",
...@@ -233,7 +233,7 @@ static struct mac_model mac_data_table[] = { ...@@ -233,7 +233,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_OLD, .scsi_type = MAC_SCSI_OLD,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_NUBUS, .expansion_type = MAC_EXP_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, { }, {
.ident = MAC_MODEL_IICX, .ident = MAC_MODEL_IICX,
.name = "IIcx", .name = "IIcx",
...@@ -242,7 +242,7 @@ static struct mac_model mac_data_table[] = { ...@@ -242,7 +242,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_OLD, .scsi_type = MAC_SCSI_OLD,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_NUBUS, .expansion_type = MAC_EXP_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, { }, {
.ident = MAC_MODEL_SE30, .ident = MAC_MODEL_SE30,
.name = "SE/30", .name = "SE/30",
...@@ -251,7 +251,7 @@ static struct mac_model mac_data_table[] = { ...@@ -251,7 +251,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_OLD, .scsi_type = MAC_SCSI_OLD,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_PDS, .expansion_type = MAC_EXP_PDS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, },
/* /*
...@@ -269,7 +269,7 @@ static struct mac_model mac_data_table[] = { ...@@ -269,7 +269,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_OLD, .scsi_type = MAC_SCSI_OLD,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_NUBUS, .expansion_type = MAC_EXP_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, { }, {
.ident = MAC_MODEL_IIFX, .ident = MAC_MODEL_IIFX,
.name = "IIfx", .name = "IIfx",
...@@ -278,7 +278,7 @@ static struct mac_model mac_data_table[] = { ...@@ -278,7 +278,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_IIFX, .scsi_type = MAC_SCSI_IIFX,
.scc_type = MAC_SCC_IOP, .scc_type = MAC_SCC_IOP,
.expansion_type = MAC_EXP_PDS_NUBUS, .expansion_type = MAC_EXP_PDS_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_IOP, .floppy_type = MAC_FLOPPY_SWIM_IOP, /* SWIM */
}, { }, {
.ident = MAC_MODEL_IISI, .ident = MAC_MODEL_IISI,
.name = "IIsi", .name = "IIsi",
...@@ -287,7 +287,7 @@ static struct mac_model mac_data_table[] = { ...@@ -287,7 +287,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_OLD, .scsi_type = MAC_SCSI_OLD,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_PDS_NUBUS, .expansion_type = MAC_EXP_PDS_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, { }, {
.ident = MAC_MODEL_IIVI, .ident = MAC_MODEL_IIVI,
.name = "IIvi", .name = "IIvi",
...@@ -296,7 +296,7 @@ static struct mac_model mac_data_table[] = { ...@@ -296,7 +296,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_LC, .scsi_type = MAC_SCSI_LC,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_NUBUS, .expansion_type = MAC_EXP_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_LC, /* SWIM */
}, { }, {
.ident = MAC_MODEL_IIVX, .ident = MAC_MODEL_IIVX,
.name = "IIvx", .name = "IIvx",
...@@ -305,7 +305,7 @@ static struct mac_model mac_data_table[] = { ...@@ -305,7 +305,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_LC, .scsi_type = MAC_SCSI_LC,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_NUBUS, .expansion_type = MAC_EXP_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_LC, /* SWIM */
}, },
/* /*
...@@ -319,7 +319,7 @@ static struct mac_model mac_data_table[] = { ...@@ -319,7 +319,7 @@ static struct mac_model mac_data_table[] = {
.via_type = MAC_VIA_IICI, .via_type = MAC_VIA_IICI,
.scsi_type = MAC_SCSI_LC, .scsi_type = MAC_SCSI_LC,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_LC, /* SWIM */
}, { }, {
.ident = MAC_MODEL_CCL, .ident = MAC_MODEL_CCL,
.name = "Color Classic", .name = "Color Classic",
...@@ -328,7 +328,7 @@ static struct mac_model mac_data_table[] = { ...@@ -328,7 +328,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_LC, .scsi_type = MAC_SCSI_LC,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_PDS, .expansion_type = MAC_EXP_PDS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_LC, /* SWIM 2 */
}, { }, {
.ident = MAC_MODEL_CCLII, .ident = MAC_MODEL_CCLII,
.name = "Color Classic II", .name = "Color Classic II",
...@@ -337,7 +337,7 @@ static struct mac_model mac_data_table[] = { ...@@ -337,7 +337,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_LC, .scsi_type = MAC_SCSI_LC,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_PDS, .expansion_type = MAC_EXP_PDS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_LC, /* SWIM 2 */
}, },
/* /*
...@@ -352,7 +352,7 @@ static struct mac_model mac_data_table[] = { ...@@ -352,7 +352,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_LC, .scsi_type = MAC_SCSI_LC,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_PDS, .expansion_type = MAC_EXP_PDS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_LC, /* SWIM */
}, { }, {
.ident = MAC_MODEL_LCII, .ident = MAC_MODEL_LCII,
.name = "LC II", .name = "LC II",
...@@ -361,7 +361,7 @@ static struct mac_model mac_data_table[] = { ...@@ -361,7 +361,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_LC, .scsi_type = MAC_SCSI_LC,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_PDS, .expansion_type = MAC_EXP_PDS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_LC, /* SWIM */
}, { }, {
.ident = MAC_MODEL_LCIII, .ident = MAC_MODEL_LCIII,
.name = "LC III", .name = "LC III",
...@@ -370,7 +370,7 @@ static struct mac_model mac_data_table[] = { ...@@ -370,7 +370,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_LC, .scsi_type = MAC_SCSI_LC,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_PDS, .expansion_type = MAC_EXP_PDS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_LC, /* SWIM 2 */
}, },
/* /*
...@@ -391,7 +391,7 @@ static struct mac_model mac_data_table[] = { ...@@ -391,7 +391,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_QUADRA, .scsi_type = MAC_SCSI_QUADRA,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.expansion_type = MAC_EXP_PDS, .expansion_type = MAC_EXP_PDS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR1, .floppy_type = MAC_FLOPPY_QUADRA, /* SWIM 2 */
}, { }, {
.ident = MAC_MODEL_Q605_ACC, .ident = MAC_MODEL_Q605_ACC,
.name = "Quadra 605", .name = "Quadra 605",
...@@ -400,7 +400,7 @@ static struct mac_model mac_data_table[] = { ...@@ -400,7 +400,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_QUADRA, .scsi_type = MAC_SCSI_QUADRA,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.expansion_type = MAC_EXP_PDS, .expansion_type = MAC_EXP_PDS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR1, .floppy_type = MAC_FLOPPY_QUADRA, /* SWIM 2 */
}, { }, {
.ident = MAC_MODEL_Q610, .ident = MAC_MODEL_Q610,
.name = "Quadra 610", .name = "Quadra 610",
...@@ -410,7 +410,7 @@ static struct mac_model mac_data_table[] = { ...@@ -410,7 +410,7 @@ static struct mac_model mac_data_table[] = {
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.ether_type = MAC_ETHER_SONIC, .ether_type = MAC_ETHER_SONIC,
.expansion_type = MAC_EXP_PDS_NUBUS, .expansion_type = MAC_EXP_PDS_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR1, .floppy_type = MAC_FLOPPY_QUADRA, /* SWIM 2 */
}, { }, {
.ident = MAC_MODEL_Q630, .ident = MAC_MODEL_Q630,
.name = "Quadra 630", .name = "Quadra 630",
...@@ -420,7 +420,7 @@ static struct mac_model mac_data_table[] = { ...@@ -420,7 +420,7 @@ static struct mac_model mac_data_table[] = {
.ide_type = MAC_IDE_QUADRA, .ide_type = MAC_IDE_QUADRA,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.expansion_type = MAC_EXP_PDS_COMM, .expansion_type = MAC_EXP_PDS_COMM,
.floppy_type = MAC_FLOPPY_SWIM_ADDR1, .floppy_type = MAC_FLOPPY_QUADRA, /* SWIM 2 */
}, { }, {
.ident = MAC_MODEL_Q650, .ident = MAC_MODEL_Q650,
.name = "Quadra 650", .name = "Quadra 650",
...@@ -430,7 +430,7 @@ static struct mac_model mac_data_table[] = { ...@@ -430,7 +430,7 @@ static struct mac_model mac_data_table[] = {
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.ether_type = MAC_ETHER_SONIC, .ether_type = MAC_ETHER_SONIC,
.expansion_type = MAC_EXP_PDS_NUBUS, .expansion_type = MAC_EXP_PDS_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR1, .floppy_type = MAC_FLOPPY_QUADRA, /* SWIM 2 */
}, },
/* The Q700 does have a NS Sonic */ /* The Q700 does have a NS Sonic */
{ {
...@@ -442,7 +442,7 @@ static struct mac_model mac_data_table[] = { ...@@ -442,7 +442,7 @@ static struct mac_model mac_data_table[] = {
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.ether_type = MAC_ETHER_SONIC, .ether_type = MAC_ETHER_SONIC,
.expansion_type = MAC_EXP_PDS_NUBUS, .expansion_type = MAC_EXP_PDS_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR1, .floppy_type = MAC_FLOPPY_QUADRA, /* SWIM */
}, { }, {
.ident = MAC_MODEL_Q800, .ident = MAC_MODEL_Q800,
.name = "Quadra 800", .name = "Quadra 800",
...@@ -452,7 +452,7 @@ static struct mac_model mac_data_table[] = { ...@@ -452,7 +452,7 @@ static struct mac_model mac_data_table[] = {
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.ether_type = MAC_ETHER_SONIC, .ether_type = MAC_ETHER_SONIC,
.expansion_type = MAC_EXP_PDS_NUBUS, .expansion_type = MAC_EXP_PDS_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR1, .floppy_type = MAC_FLOPPY_QUADRA, /* SWIM 2 */
}, { }, {
.ident = MAC_MODEL_Q840, .ident = MAC_MODEL_Q840,
.name = "Quadra 840AV", .name = "Quadra 840AV",
...@@ -462,7 +462,7 @@ static struct mac_model mac_data_table[] = { ...@@ -462,7 +462,7 @@ static struct mac_model mac_data_table[] = {
.scc_type = MAC_SCC_PSC, .scc_type = MAC_SCC_PSC,
.ether_type = MAC_ETHER_MACE, .ether_type = MAC_ETHER_MACE,
.expansion_type = MAC_EXP_NUBUS, .expansion_type = MAC_EXP_NUBUS,
.floppy_type = MAC_FLOPPY_AV, .floppy_type = MAC_FLOPPY_UNSUPPORTED, /* New Age */
}, { }, {
.ident = MAC_MODEL_Q900, .ident = MAC_MODEL_Q900,
.name = "Quadra 900", .name = "Quadra 900",
...@@ -472,7 +472,7 @@ static struct mac_model mac_data_table[] = { ...@@ -472,7 +472,7 @@ static struct mac_model mac_data_table[] = {
.scc_type = MAC_SCC_IOP, .scc_type = MAC_SCC_IOP,
.ether_type = MAC_ETHER_SONIC, .ether_type = MAC_ETHER_SONIC,
.expansion_type = MAC_EXP_PDS_NUBUS, .expansion_type = MAC_EXP_PDS_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_IOP, .floppy_type = MAC_FLOPPY_SWIM_IOP, /* SWIM */
}, { }, {
.ident = MAC_MODEL_Q950, .ident = MAC_MODEL_Q950,
.name = "Quadra 950", .name = "Quadra 950",
...@@ -482,7 +482,7 @@ static struct mac_model mac_data_table[] = { ...@@ -482,7 +482,7 @@ static struct mac_model mac_data_table[] = {
.scc_type = MAC_SCC_IOP, .scc_type = MAC_SCC_IOP,
.ether_type = MAC_ETHER_SONIC, .ether_type = MAC_ETHER_SONIC,
.expansion_type = MAC_EXP_PDS_NUBUS, .expansion_type = MAC_EXP_PDS_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_IOP, .floppy_type = MAC_FLOPPY_SWIM_IOP, /* SWIM */
}, },
/* /*
...@@ -497,7 +497,7 @@ static struct mac_model mac_data_table[] = { ...@@ -497,7 +497,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_LC, .scsi_type = MAC_SCSI_LC,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_PDS, .expansion_type = MAC_EXP_PDS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_LC, /* SWIM 2 */
}, { }, {
.ident = MAC_MODEL_P475, .ident = MAC_MODEL_P475,
.name = "Performa 475", .name = "Performa 475",
...@@ -506,7 +506,7 @@ static struct mac_model mac_data_table[] = { ...@@ -506,7 +506,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_QUADRA, .scsi_type = MAC_SCSI_QUADRA,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_PDS, .expansion_type = MAC_EXP_PDS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR1, .floppy_type = MAC_FLOPPY_QUADRA, /* SWIM 2 */
}, { }, {
.ident = MAC_MODEL_P475F, .ident = MAC_MODEL_P475F,
.name = "Performa 475", .name = "Performa 475",
...@@ -515,7 +515,7 @@ static struct mac_model mac_data_table[] = { ...@@ -515,7 +515,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_QUADRA, .scsi_type = MAC_SCSI_QUADRA,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_PDS, .expansion_type = MAC_EXP_PDS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR1, .floppy_type = MAC_FLOPPY_QUADRA, /* SWIM 2 */
}, { }, {
.ident = MAC_MODEL_P520, .ident = MAC_MODEL_P520,
.name = "Performa 520", .name = "Performa 520",
...@@ -524,7 +524,7 @@ static struct mac_model mac_data_table[] = { ...@@ -524,7 +524,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_LC, .scsi_type = MAC_SCSI_LC,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_PDS, .expansion_type = MAC_EXP_PDS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_LC, /* SWIM 2 */
}, { }, {
.ident = MAC_MODEL_P550, .ident = MAC_MODEL_P550,
.name = "Performa 550", .name = "Performa 550",
...@@ -533,7 +533,7 @@ static struct mac_model mac_data_table[] = { ...@@ -533,7 +533,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_LC, .scsi_type = MAC_SCSI_LC,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_PDS, .expansion_type = MAC_EXP_PDS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_LC, /* SWIM 2 */
}, },
/* These have the comm slot, and therefore possibly SONIC ethernet */ /* These have the comm slot, and therefore possibly SONIC ethernet */
{ {
...@@ -544,7 +544,7 @@ static struct mac_model mac_data_table[] = { ...@@ -544,7 +544,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_QUADRA, .scsi_type = MAC_SCSI_QUADRA,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_PDS_COMM, .expansion_type = MAC_EXP_PDS_COMM,
.floppy_type = MAC_FLOPPY_SWIM_ADDR1, .floppy_type = MAC_FLOPPY_QUADRA, /* SWIM 2 */
}, { }, {
.ident = MAC_MODEL_P588, .ident = MAC_MODEL_P588,
.name = "Performa 588", .name = "Performa 588",
...@@ -554,7 +554,7 @@ static struct mac_model mac_data_table[] = { ...@@ -554,7 +554,7 @@ static struct mac_model mac_data_table[] = {
.ide_type = MAC_IDE_QUADRA, .ide_type = MAC_IDE_QUADRA,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_PDS_COMM, .expansion_type = MAC_EXP_PDS_COMM,
.floppy_type = MAC_FLOPPY_SWIM_ADDR1, .floppy_type = MAC_FLOPPY_QUADRA, /* SWIM 2 */
}, { }, {
.ident = MAC_MODEL_TV, .ident = MAC_MODEL_TV,
.name = "TV", .name = "TV",
...@@ -562,7 +562,7 @@ static struct mac_model mac_data_table[] = { ...@@ -562,7 +562,7 @@ static struct mac_model mac_data_table[] = {
.via_type = MAC_VIA_IICI, .via_type = MAC_VIA_IICI,
.scsi_type = MAC_SCSI_LC, .scsi_type = MAC_SCSI_LC,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_LC, /* SWIM 2 */
}, { }, {
.ident = MAC_MODEL_P600, .ident = MAC_MODEL_P600,
.name = "Performa 600", .name = "Performa 600",
...@@ -571,7 +571,7 @@ static struct mac_model mac_data_table[] = { ...@@ -571,7 +571,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_LC, .scsi_type = MAC_SCSI_LC,
.scc_type = MAC_SCC_II, .scc_type = MAC_SCC_II,
.expansion_type = MAC_EXP_NUBUS, .expansion_type = MAC_EXP_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_LC, /* SWIM */
}, },
/* /*
...@@ -588,7 +588,7 @@ static struct mac_model mac_data_table[] = { ...@@ -588,7 +588,7 @@ static struct mac_model mac_data_table[] = {
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.ether_type = MAC_ETHER_SONIC, .ether_type = MAC_ETHER_SONIC,
.expansion_type = MAC_EXP_PDS_NUBUS, .expansion_type = MAC_EXP_PDS_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR1, .floppy_type = MAC_FLOPPY_QUADRA, /* SWIM 2 */
}, { }, {
.ident = MAC_MODEL_C650, .ident = MAC_MODEL_C650,
.name = "Centris 650", .name = "Centris 650",
...@@ -598,7 +598,7 @@ static struct mac_model mac_data_table[] = { ...@@ -598,7 +598,7 @@ static struct mac_model mac_data_table[] = {
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.ether_type = MAC_ETHER_SONIC, .ether_type = MAC_ETHER_SONIC,
.expansion_type = MAC_EXP_PDS_NUBUS, .expansion_type = MAC_EXP_PDS_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR1, .floppy_type = MAC_FLOPPY_QUADRA, /* SWIM 2 */
}, { }, {
.ident = MAC_MODEL_C660, .ident = MAC_MODEL_C660,
.name = "Centris 660AV", .name = "Centris 660AV",
...@@ -608,7 +608,7 @@ static struct mac_model mac_data_table[] = { ...@@ -608,7 +608,7 @@ static struct mac_model mac_data_table[] = {
.scc_type = MAC_SCC_PSC, .scc_type = MAC_SCC_PSC,
.ether_type = MAC_ETHER_MACE, .ether_type = MAC_ETHER_MACE,
.expansion_type = MAC_EXP_PDS_NUBUS, .expansion_type = MAC_EXP_PDS_NUBUS,
.floppy_type = MAC_FLOPPY_AV, .floppy_type = MAC_FLOPPY_UNSUPPORTED, /* New Age */
}, },
/* /*
...@@ -624,7 +624,7 @@ static struct mac_model mac_data_table[] = { ...@@ -624,7 +624,7 @@ static struct mac_model mac_data_table[] = {
.via_type = MAC_VIA_QUADRA, .via_type = MAC_VIA_QUADRA,
.scsi_type = MAC_SCSI_OLD, .scsi_type = MAC_SCSI_OLD,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, { }, {
.ident = MAC_MODEL_PB145, .ident = MAC_MODEL_PB145,
.name = "PowerBook 145", .name = "PowerBook 145",
...@@ -632,7 +632,7 @@ static struct mac_model mac_data_table[] = { ...@@ -632,7 +632,7 @@ static struct mac_model mac_data_table[] = {
.via_type = MAC_VIA_QUADRA, .via_type = MAC_VIA_QUADRA,
.scsi_type = MAC_SCSI_OLD, .scsi_type = MAC_SCSI_OLD,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, { }, {
.ident = MAC_MODEL_PB150, .ident = MAC_MODEL_PB150,
.name = "PowerBook 150", .name = "PowerBook 150",
...@@ -641,7 +641,7 @@ static struct mac_model mac_data_table[] = { ...@@ -641,7 +641,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_OLD, .scsi_type = MAC_SCSI_OLD,
.ide_type = MAC_IDE_PB, .ide_type = MAC_IDE_PB,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, { }, {
.ident = MAC_MODEL_PB160, .ident = MAC_MODEL_PB160,
.name = "PowerBook 160", .name = "PowerBook 160",
...@@ -649,7 +649,7 @@ static struct mac_model mac_data_table[] = { ...@@ -649,7 +649,7 @@ static struct mac_model mac_data_table[] = {
.via_type = MAC_VIA_QUADRA, .via_type = MAC_VIA_QUADRA,
.scsi_type = MAC_SCSI_OLD, .scsi_type = MAC_SCSI_OLD,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, { }, {
.ident = MAC_MODEL_PB165, .ident = MAC_MODEL_PB165,
.name = "PowerBook 165", .name = "PowerBook 165",
...@@ -657,7 +657,7 @@ static struct mac_model mac_data_table[] = { ...@@ -657,7 +657,7 @@ static struct mac_model mac_data_table[] = {
.via_type = MAC_VIA_QUADRA, .via_type = MAC_VIA_QUADRA,
.scsi_type = MAC_SCSI_OLD, .scsi_type = MAC_SCSI_OLD,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, { }, {
.ident = MAC_MODEL_PB165C, .ident = MAC_MODEL_PB165C,
.name = "PowerBook 165c", .name = "PowerBook 165c",
...@@ -665,7 +665,7 @@ static struct mac_model mac_data_table[] = { ...@@ -665,7 +665,7 @@ static struct mac_model mac_data_table[] = {
.via_type = MAC_VIA_QUADRA, .via_type = MAC_VIA_QUADRA,
.scsi_type = MAC_SCSI_OLD, .scsi_type = MAC_SCSI_OLD,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, { }, {
.ident = MAC_MODEL_PB170, .ident = MAC_MODEL_PB170,
.name = "PowerBook 170", .name = "PowerBook 170",
...@@ -673,7 +673,7 @@ static struct mac_model mac_data_table[] = { ...@@ -673,7 +673,7 @@ static struct mac_model mac_data_table[] = {
.via_type = MAC_VIA_QUADRA, .via_type = MAC_VIA_QUADRA,
.scsi_type = MAC_SCSI_OLD, .scsi_type = MAC_SCSI_OLD,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, { }, {
.ident = MAC_MODEL_PB180, .ident = MAC_MODEL_PB180,
.name = "PowerBook 180", .name = "PowerBook 180",
...@@ -681,7 +681,7 @@ static struct mac_model mac_data_table[] = { ...@@ -681,7 +681,7 @@ static struct mac_model mac_data_table[] = {
.via_type = MAC_VIA_QUADRA, .via_type = MAC_VIA_QUADRA,
.scsi_type = MAC_SCSI_OLD, .scsi_type = MAC_SCSI_OLD,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, { }, {
.ident = MAC_MODEL_PB180C, .ident = MAC_MODEL_PB180C,
.name = "PowerBook 180c", .name = "PowerBook 180c",
...@@ -689,7 +689,7 @@ static struct mac_model mac_data_table[] = { ...@@ -689,7 +689,7 @@ static struct mac_model mac_data_table[] = {
.via_type = MAC_VIA_QUADRA, .via_type = MAC_VIA_QUADRA,
.scsi_type = MAC_SCSI_OLD, .scsi_type = MAC_SCSI_OLD,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, { }, {
.ident = MAC_MODEL_PB190, .ident = MAC_MODEL_PB190,
.name = "PowerBook 190", .name = "PowerBook 190",
...@@ -698,7 +698,7 @@ static struct mac_model mac_data_table[] = { ...@@ -698,7 +698,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_OLD, .scsi_type = MAC_SCSI_OLD,
.ide_type = MAC_IDE_BABOON, .ide_type = MAC_IDE_BABOON,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM 2 */
}, { }, {
.ident = MAC_MODEL_PB520, .ident = MAC_MODEL_PB520,
.name = "PowerBook 520", .name = "PowerBook 520",
...@@ -707,7 +707,7 @@ static struct mac_model mac_data_table[] = { ...@@ -707,7 +707,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_OLD, .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_OLD, /* SWIM 2 */
}, },
/* /*
...@@ -724,7 +724,7 @@ static struct mac_model mac_data_table[] = { ...@@ -724,7 +724,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_DUO, .scsi_type = MAC_SCSI_DUO,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.expansion_type = MAC_EXP_NUBUS, .expansion_type = MAC_EXP_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, { }, {
.ident = MAC_MODEL_PB230, .ident = MAC_MODEL_PB230,
.name = "PowerBook Duo 230", .name = "PowerBook Duo 230",
...@@ -733,7 +733,7 @@ static struct mac_model mac_data_table[] = { ...@@ -733,7 +733,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_DUO, .scsi_type = MAC_SCSI_DUO,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.expansion_type = MAC_EXP_NUBUS, .expansion_type = MAC_EXP_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, { }, {
.ident = MAC_MODEL_PB250, .ident = MAC_MODEL_PB250,
.name = "PowerBook Duo 250", .name = "PowerBook Duo 250",
...@@ -742,7 +742,7 @@ static struct mac_model mac_data_table[] = { ...@@ -742,7 +742,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_DUO, .scsi_type = MAC_SCSI_DUO,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.expansion_type = MAC_EXP_NUBUS, .expansion_type = MAC_EXP_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, { }, {
.ident = MAC_MODEL_PB270C, .ident = MAC_MODEL_PB270C,
.name = "PowerBook Duo 270c", .name = "PowerBook Duo 270c",
...@@ -751,7 +751,7 @@ static struct mac_model mac_data_table[] = { ...@@ -751,7 +751,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_DUO, .scsi_type = MAC_SCSI_DUO,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.expansion_type = MAC_EXP_NUBUS, .expansion_type = MAC_EXP_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, { }, {
.ident = MAC_MODEL_PB280, .ident = MAC_MODEL_PB280,
.name = "PowerBook Duo 280", .name = "PowerBook Duo 280",
...@@ -760,7 +760,7 @@ static struct mac_model mac_data_table[] = { ...@@ -760,7 +760,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_DUO, .scsi_type = MAC_SCSI_DUO,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.expansion_type = MAC_EXP_NUBUS, .expansion_type = MAC_EXP_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, { }, {
.ident = MAC_MODEL_PB280C, .ident = MAC_MODEL_PB280C,
.name = "PowerBook Duo 280c", .name = "PowerBook Duo 280c",
...@@ -769,7 +769,7 @@ static struct mac_model mac_data_table[] = { ...@@ -769,7 +769,7 @@ static struct mac_model mac_data_table[] = {
.scsi_type = MAC_SCSI_DUO, .scsi_type = MAC_SCSI_DUO,
.scc_type = MAC_SCC_QUADRA, .scc_type = MAC_SCC_QUADRA,
.expansion_type = MAC_EXP_NUBUS, .expansion_type = MAC_EXP_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2, .floppy_type = MAC_FLOPPY_OLD, /* SWIM */
}, },
/* /*
...@@ -960,7 +960,7 @@ static const struct resource mac_scsi_ccl_rsrc[] __initconst = { ...@@ -960,7 +960,7 @@ static const struct resource mac_scsi_ccl_rsrc[] __initconst = {
int __init mac_platform_init(void) int __init mac_platform_init(void)
{ {
u8 *swim_base; phys_addr_t swim_base = 0;
if (!MACH_IS_MAC) if (!MACH_IS_MAC)
return -ENODEV; return -ENODEV;
...@@ -977,22 +977,22 @@ int __init mac_platform_init(void) ...@@ -977,22 +977,22 @@ int __init mac_platform_init(void)
*/ */
switch (macintosh_config->floppy_type) { switch (macintosh_config->floppy_type) {
case MAC_FLOPPY_SWIM_ADDR1: case MAC_FLOPPY_QUADRA:
swim_base = (u8 *)(VIA1_BASE + 0x1E000); swim_base = 0x5001E000;
break; break;
case MAC_FLOPPY_SWIM_ADDR2: case MAC_FLOPPY_OLD:
swim_base = (u8 *)(VIA1_BASE + 0x16000); swim_base = 0x50016000;
break; break;
default: case MAC_FLOPPY_LC:
swim_base = NULL; swim_base = 0x50F16000;
break; break;
} }
if (swim_base) { if (swim_base) {
struct resource swim_rsrc = { struct resource swim_rsrc = {
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
.start = (resource_size_t)swim_base, .start = swim_base,
.end = (resource_size_t)swim_base + 0x1FFF, .end = swim_base + 0x1FFF,
}; };
platform_device_register_simple("swim", -1, &swim_rsrc, 1); platform_device_register_simple("swim", -1, &swim_rsrc, 1);
......
drivers/video/fbdev/atafb.c
View file @ dbcda58a
...@@ -763,17 +763,17 @@ static void tt_get_par(struct atafb_par *par) ...@@ -763,17 +763,17 @@ static void tt_get_par(struct atafb_par *par)
{ {
unsigned long addr; unsigned long addr;
par->hw.tt.mode = shifter_tt.tt_shiftmode; par->hw.tt.mode = shifter_tt.tt_shiftmode;
par->hw.tt.sync = shifter.syncmode; par->hw.tt.sync = shifter_st.syncmode;
addr = ((shifter.bas_hi & 0xff) << 16) | addr = ((shifter_st.bas_hi & 0xff) << 16) |
((shifter.bas_md & 0xff) << 8) | ((shifter_st.bas_md & 0xff) << 8) |
((shifter.bas_lo & 0xff)); ((shifter_st.bas_lo & 0xff));
par->screen_base = atari_stram_to_virt(addr); par->screen_base = atari_stram_to_virt(addr);
} }
static void tt_set_par(struct atafb_par *par) static void tt_set_par(struct atafb_par *par)
{ {
shifter_tt.tt_shiftmode = par->hw.tt.mode; shifter_tt.tt_shiftmode = par->hw.tt.mode;
shifter.syncmode = par->hw.tt.sync; shifter_st.syncmode = par->hw.tt.sync;
/* only set screen_base if really necessary */ /* only set screen_base if really necessary */
if (current_par.screen_base != par->screen_base) if (current_par.screen_base != par->screen_base)
fbhw->set_screen_base(par->screen_base); fbhw->set_screen_base(par->screen_base);
...@@ -1543,7 +1543,7 @@ static void falcon_get_par(struct atafb_par *par) ...@@ -1543,7 +1543,7 @@ static void falcon_get_par(struct atafb_par *par)
hw->f_shift = videl.f_shift; hw->f_shift = videl.f_shift;
hw->vid_control = videl.control; hw->vid_control = videl.control;
hw->vid_mode = videl.mode; hw->vid_mode = videl.mode;
hw->sync = shifter.syncmode & 0x1; hw->sync = shifter_st.syncmode & 0x1;
hw->xoffset = videl.xoffset & 0xf; hw->xoffset = videl.xoffset & 0xf;
hw->hht = videl.hht; hw->hht = videl.hht;
hw->hbb = videl.hbb; hw->hbb = videl.hbb;
...@@ -1558,9 +1558,9 @@ static void falcon_get_par(struct atafb_par *par) ...@@ -1558,9 +1558,9 @@ static void falcon_get_par(struct atafb_par *par)
hw->vde = videl.vde; hw->vde = videl.vde;
hw->vss = videl.vss; hw->vss = videl.vss;
addr = (shifter.bas_hi & 0xff) << 16 | addr = (shifter_st.bas_hi & 0xff) << 16 |
(shifter.bas_md & 0xff) << 8 | (shifter_st.bas_md & 0xff) << 8 |
(shifter.bas_lo & 0xff); (shifter_st.bas_lo & 0xff);
par->screen_base = atari_stram_to_virt(addr); par->screen_base = atari_stram_to_virt(addr);
/* derived parameters */ /* derived parameters */
...@@ -1605,7 +1605,7 @@ static irqreturn_t falcon_vbl_switcher(int irq, void *dummy) ...@@ -1605,7 +1605,7 @@ static irqreturn_t falcon_vbl_switcher(int irq, void *dummy)
/* Turn off external clocks. Read sets all output bits to 1. */ /* Turn off external clocks. Read sets all output bits to 1. */
*(volatile unsigned short *)0xffff9202; *(volatile unsigned short *)0xffff9202;
} }
shifter.syncmode = hw->sync; shifter_st.syncmode = hw->sync;
videl.hht = hw->hht; videl.hht = hw->hht;
videl.hbb = hw->hbb; videl.hbb = hw->hbb;
...@@ -1952,18 +1952,18 @@ static void stste_get_par(struct atafb_par *par) ...@@ -1952,18 +1952,18 @@ static void stste_get_par(struct atafb_par *par)
{ {
unsigned long addr; unsigned long addr;
par->hw.st.mode = shifter_tt.st_shiftmode; par->hw.st.mode = shifter_tt.st_shiftmode;
par->hw.st.sync = shifter.syncmode; par->hw.st.sync = shifter_st.syncmode;
addr = ((shifter.bas_hi & 0xff) << 16) | addr = ((shifter_st.bas_hi & 0xff) << 16) |
((shifter.bas_md & 0xff) << 8); ((shifter_st.bas_md & 0xff) << 8);
if (ATARIHW_PRESENT(EXTD_SHIFTER)) if (ATARIHW_PRESENT(EXTD_SHIFTER))
addr |= (shifter.bas_lo & 0xff); addr |= (shifter_st.bas_lo & 0xff);
par->screen_base = atari_stram_to_virt(addr); par->screen_base = atari_stram_to_virt(addr);
} }
static void stste_set_par(struct atafb_par *par) static void stste_set_par(struct atafb_par *par)
{ {
shifter_tt.st_shiftmode = par->hw.st.mode; shifter_tt.st_shiftmode = par->hw.st.mode;
shifter.syncmode = par->hw.st.sync; shifter_st.syncmode = par->hw.st.sync;
/* only set screen_base if really necessary */ /* only set screen_base if really necessary */
if (current_par.screen_base != par->screen_base) if (current_par.screen_base != par->screen_base)
fbhw->set_screen_base(par->screen_base); fbhw->set_screen_base(par->screen_base);
...@@ -2018,10 +2018,10 @@ static void stste_set_screen_base(void *s_base) ...@@ -2018,10 +2018,10 @@ static void stste_set_screen_base(void *s_base)
unsigned long addr; unsigned long addr;
addr = atari_stram_to_phys(s_base); addr = atari_stram_to_phys(s_base);
/* Setup Screen Memory */ /* Setup Screen Memory */
shifter.bas_hi = (unsigned char)((addr & 0xff0000) >> 16); shifter_st.bas_hi = (unsigned char)((addr & 0xff0000) >> 16);
shifter.bas_md = (unsigned char)((addr & 0x00ff00) >> 8); shifter_st.bas_md = (unsigned char)((addr & 0x00ff00) >> 8);
if (ATARIHW_PRESENT(EXTD_SHIFTER)) if (ATARIHW_PRESENT(EXTD_SHIFTER))
shifter.bas_lo = (unsigned char)(addr & 0x0000ff); shifter_st.bas_lo = (unsigned char)(addr & 0x0000ff);
} }
#endif /* ATAFB_STE */ #endif /* ATAFB_STE */
...@@ -2265,9 +2265,9 @@ static void set_screen_base(void *s_base) ...@@ -2265,9 +2265,9 @@ static void set_screen_base(void *s_base)
addr = atari_stram_to_phys(s_base); addr = atari_stram_to_phys(s_base);
/* Setup Screen Memory */ /* Setup Screen Memory */
shifter.bas_hi = (unsigned char)((addr & 0xff0000) >> 16); shifter_st.bas_hi = (unsigned char)((addr & 0xff0000) >> 16);
shifter.bas_md = (unsigned char)((addr & 0x00ff00) >> 8); shifter_st.bas_md = (unsigned char)((addr & 0x00ff00) >> 8);
shifter.bas_lo = (unsigned char)(addr & 0x0000ff); shifter_st.bas_lo = (unsigned char)(addr & 0x0000ff);
} }
static int pan_display(struct fb_var_screeninfo *var, struct fb_info *info) static int pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7