From a5a614c129eaa6b9f0bdc2ea5da01789e18033b1 Mon Sep 17 00:00:00 2001 From: Holger Brunck Date: Mon, 21 Jan 2013 03:55:13 +0000 Subject: km/common: remove unneeded ifdefs for I2C All boards from this serie use i2c. There is no need to #ifdef the header. Signed-off-by: Holger Brunck --- board/keymile/common/common.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'board/keymile/common/common.c') diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 6f407b7..468c755 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -38,9 +38,7 @@ #include "post.h" #endif #include "common.h" -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C) #include -#endif #if !defined(CONFIG_MPC83xx) static void i2c_write_start_seq(void); -- cgit v1.1 From 1eb95ebe0d466d793fcf1f689fc20f6cc83c7fe1 Mon Sep 17 00:00:00 2001 From: Karlheinz Jerg Date: Mon, 21 Jan 2013 03:55:16 +0000 Subject: km82xx, km83xx: move ethernet_present() from common to cpu specific For kmvect1 we need a special solution and for km_arm boards we already have. So move the common code to the architectur specific file. Signed-off-by: Karlheinz Jerg Signed-off-by: Holger Brunck --- board/keymile/common/common.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'board/keymile/common/common.c') diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 468c755..ef93ed3 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -183,17 +183,6 @@ void i2c_init_board(void) } #endif - -#if !defined(MACH_TYPE_KM_KIRKWOOD) -int ethernet_present(void) -{ - struct km_bec_fpga *base = - (struct km_bec_fpga *)CONFIG_SYS_KMBEC_FPGA_BASE; - - return in_8(&base->bprth) & PIGGY_PRESENT; -} -#endif - int board_eth_init(bd_t *bis) { if (ethernet_present()) -- cgit v1.1