Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4833c16d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
  Blackfin: fix inverted anomaly 05000481 logic
  Blackfin: drop unused irq_panic()/DEBUG_ICACHE_CHECK
  Blackfin: ppi/spi/twi headers: add missing __BFP undef
  Blackfin: update defconfigs
  Blackfin: bfin_twi.h: start a common TWI header
  netdev: bfin_mac: push settings to platform resources
parents e0e170bd ad3e01a3

arch/blackfin/Kconfig.debug

+0 −11
Original line number Original line Diff line number Diff line
@@ -102,17 +102,6 @@ config DEBUG_DOUBLEFAULT_RESET 




endchoice

endchoice





config DEBUG_ICACHE_CHECK

	bool "Check Instruction cache coherency"

	depends on DEBUG_KERNEL

	depends on DEBUG_HWERR

	help

	  Say Y here if you are getting weird unexplained errors. This will

	  ensure that icache is what SDRAM says it should be by doing a

	  byte wise comparison between SDRAM and instruction cache. This

	  also relocates the irq_panic() function to L1 memory, (which is

	  un-cached).



config DEBUG_HUNT_FOR_ZERO

config DEBUG_HUNT_FOR_ZERO

	bool "Catch NULL pointer reads/writes"

	bool "Catch NULL pointer reads/writes"

	default y

	default y

arch/blackfin/configs/BF518F-EZBRD_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ CONFIG_C_CDPRIO=y 
CONFIG_BANK_3=0x99B2

CONFIG_BANK_3=0x99B2

CONFIG_BINFMT_FLAT=y

CONFIG_BINFMT_FLAT=y

CONFIG_BINFMT_ZFLAT=y

CONFIG_BINFMT_ZFLAT=y

CONFIG_PM=y

CONFIG_NET=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_UNIX=y
@@ -114,7 +115,6 @@ CONFIG_DEBUG_DOUBLEFAULT=y 
CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y

CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y

CONFIG_EARLY_PRINTK=y

CONFIG_EARLY_PRINTK=y

CONFIG_CPLB_INFO=y

CONFIG_CPLB_INFO=y

CONFIG_SECURITY=y

CONFIG_CRYPTO=y

CONFIG_CRYPTO=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRC_CCITT=m
 
CONFIG_CRC_CCITT=m

arch/blackfin/configs/BF526-EZBRD_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ CONFIG_C_CDPRIO=y 
CONFIG_BANK_3=0x99B2

CONFIG_BANK_3=0x99B2

CONFIG_BINFMT_FLAT=y

CONFIG_BINFMT_FLAT=y

CONFIG_BINFMT_ZFLAT=y

CONFIG_BINFMT_ZFLAT=y

CONFIG_PM=y

CONFIG_NET=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_UNIX=y
@@ -152,7 +153,6 @@ CONFIG_DEBUG_DOUBLEFAULT=y 
CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y

CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y

CONFIG_EARLY_PRINTK=y

CONFIG_EARLY_PRINTK=y

CONFIG_CPLB_INFO=y

CONFIG_CPLB_INFO=y

CONFIG_SECURITY=y

CONFIG_CRYPTO=y

CONFIG_CRYPTO=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRC_CCITT=m
 
CONFIG_CRC_CCITT=m

arch/blackfin/configs/BF527-AD7160-EVAL_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -9,6 +9,7 @@ CONFIG_EMBEDDED=y 
# CONFIG_ELF_CORE is not set

# CONFIG_ELF_CORE is not set

# CONFIG_AIO is not set

# CONFIG_AIO is not set

CONFIG_SLAB=y

CONFIG_SLAB=y

CONFIG_MMAP_ALLOW_UNINITIALIZED=y

CONFIG_MODULES=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_BSG is not set
@@ -101,5 +102,4 @@ CONFIG_DETECT_HUNG_TASK=y 
# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set

# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set

CONFIG_EARLY_PRINTK=y

CONFIG_EARLY_PRINTK=y

CONFIG_CPLB_INFO=y

CONFIG_CPLB_INFO=y

CONFIG_SECURITY=y

CONFIG_CRC_CCITT=m
 
CONFIG_CRC_CCITT=m

arch/blackfin/configs/BF527-EZKIT-V2_defconfig

+2 −1
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_LBDAF is not set

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_BF527=y

CONFIG_BF527=y

CONFIG_BF_REV_0_2=y

CONFIG_BF_REV_0_2=y
@@ -38,6 +39,7 @@ CONFIG_C_CDPRIO=y 
CONFIG_BANK_3=0x99B2

CONFIG_BANK_3=0x99B2

CONFIG_BINFMT_FLAT=y

CONFIG_BINFMT_FLAT=y

CONFIG_BINFMT_ZFLAT=y

CONFIG_BINFMT_ZFLAT=y

CONFIG_PM=y

CONFIG_NET=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_UNIX=y
@@ -181,6 +183,5 @@ CONFIG_DEBUG_DOUBLEFAULT=y 
CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y

CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y

CONFIG_EARLY_PRINTK=y

CONFIG_EARLY_PRINTK=y

CONFIG_CPLB_INFO=y

CONFIG_CPLB_INFO=y

CONFIG_SECURITY=y

CONFIG_CRYPTO=y

CONFIG_CRYPTO=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set
 
# CONFIG_CRYPTO_ANSI_CPRNG is not set