POST: Remove duplicated post_hotkey_pressed() functions

This patch introduces a weak default function for post_hotkey_pressed(),
returning 0, for boards without hotkey support. The long-running tests
won't be started on those boards. This default function was implemented
in many board directories. By implementing this weak default we can
remove all those duplicate versions.

Boards with hotkey support, can override this weak default function
by defining one in their board specific code.

Signed-off-by: Stefan Roese <sr@denx.de>

diff --git a/board/amcc/katmai/katmai.c b/board/amcc/katmai/katmai.c
index 86dc923e7abbc77a3415c0cf465251d30537cd2e..54e2a39aa14dd2cc9122b025619af8ba819ef996 100644 (file)
--- a/board/amcc/katmai/katmai.c
+++ b/board/amcc/katmai/katmai.c
@@ -279,17 +279,6 @@ int board_pcie_card_present(int port)
 }
 #endif /* defined(CONFIG_PCI) */
 
-#ifdef CONFIG_POST
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-       return (ctrlc());
-}
-#endif
-
 int board_eth_init(bd_t *bis)
 {
        cpu_eth_init(bis);

diff --git a/board/amcc/kilauea/kilauea.c b/board/amcc/kilauea/kilauea.c
index 2f99ea1130aa0c864c711e0383b61d1b132290fd..8ce244555acfdde7cb9c891368807860c948c082 100644 (file)
--- a/board/amcc/kilauea/kilauea.c
+++ b/board/amcc/kilauea/kilauea.c
@@ -284,14 +284,3 @@ int checkboard (void)
 
        return (0);
 }
-
-#if defined(CONFIG_POST)
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-       return 0;       /* No hotkeys supported */
-}
-#endif /* CONFIG_POST */

diff --git a/board/amcc/makalu/makalu.c b/board/amcc/makalu/makalu.c
index 3d860af9a13048cc4d0f58a9b85a9c2b4f08f8f7..4afe0916652e852ebb1e31e7c802ee721e7ff93b 100644 (file)
--- a/board/amcc/makalu/makalu.c
+++ b/board/amcc/makalu/makalu.c
@@ -236,14 +236,3 @@ int checkboard (void)
 
        return (0);
 }
-
-#if defined(CONFIG_POST)
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-       return 0;       /* No hotkeys supported */
-}
-#endif /* CONFIG_POST */

diff --git a/board/amcc/ocotea/ocotea.c b/board/amcc/ocotea/ocotea.c
index 951a8b5394f562e984a4cecf76c2d557eaef6db4..7bffa3c4082f772a3b8f904cab15072040320aed 100644 (file)
--- a/board/amcc/ocotea/ocotea.c
+++ b/board/amcc/ocotea/ocotea.c
@@ -400,15 +400,3 @@ void fpga_init(void)
 
        return;
 }
-
-#ifdef CONFIG_POST
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-
-       return (ctrlc());
-}
-#endif

diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c
index cb34c9d7df8ad2e2a69fff4779871647b52ed5f9..6756a27238ef7afd6db132b205b252653e4b0d31 100644 (file)
--- a/board/amcc/sequoia/sequoia.c
+++ b/board/amcc/sequoia/sequoia.c
@@ -370,17 +370,6 @@ void board_pci_fixup_irq(struct pci_controller *hose, pci_dev_t dev)
 }
 #endif
 
-#if defined(CONFIG_POST)
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-       return 0;       /* No hotkeys supported */
-}
-#endif /* CONFIG_POST */
-
 #if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_SYS_RAMBOOT)
 /*
  * On NAND-booting sequoia, we need to patch the chips select numbers

diff --git a/board/amcc/taishan/taishan.c b/board/amcc/taishan/taishan.c
index 279fae21c1cf45bfd42ccadc36b830e81198381e..cac7a78d69e57ad54e60eb68dba6230daf85c8c2 100644 (file)
--- a/board/amcc/taishan/taishan.c
+++ b/board/amcc/taishan/taishan.c
@@ -209,17 +209,6 @@ int checkboard (void)
        return (0);
 }
 
-#ifdef CONFIG_POST
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-       return (ctrlc());
-}
-#endif
-
 int board_eth_init(bd_t *bis)
 {
        cpu_eth_init(bis);

diff --git a/board/amcc/yucca/yucca.c b/board/amcc/yucca/yucca.c
index e0d19bcb68a08914b84cfb1fce97d833d2f37d9b..67a016787a41aa9bfd50b4a102d4ad5a8b53f842 100644 (file)
--- a/board/amcc/yucca/yucca.c
+++ b/board/amcc/yucca/yucca.c
@@ -708,17 +708,6 @@ void fpga_init(void)
        return;
 }
 
-#ifdef CONFIG_POST
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-       return (ctrlc());
-}
-#endif
-
 /*---------------------------------------------------------------------------+
  | onboard_pci_arbiter_selected => from EPLD
  +---------------------------------------------------------------------------*/

diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c
index 9e2f1a5366bbdc43d061988c07cc511c97ff0f8d..0b5412bde62689949b58db5d108baf462f224337 100644 (file)
--- a/board/cm5200/cm5200.c
+++ b/board/cm5200/cm5200.c
@@ -330,14 +330,6 @@ int board_early_init_r(void)
 }
 
 
-#ifdef CONFIG_POST
-int post_hotkeys_pressed(void)
-{
-       return 0;
-}
-#endif /* CONFIG_POST */
-
-
 #if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER)
 void post_word_store(ulong a)
 {

diff --git a/board/esd/pmc440/pmc440.c b/board/esd/pmc440/pmc440.c
index d0ff080fadefe1b90fa5baf1e1e6f7b9bd632dd7..bd43a9aef0d6ccf6a23ed58a61f81c9b66a83865 100644 (file)
--- a/board/esd/pmc440/pmc440.c
+++ b/board/esd/pmc440/pmc440.c
@@ -677,17 +677,6 @@ int is_pci_host(struct pci_controller *hose)
 }
 #endif /* defined(CONFIG_PCI) */
 
-#if defined(CONFIG_POST)
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-       return 0;       /* No hotkeys supported */
-}
-#endif /* CONFIG_POST */
-
 #ifdef CONFIG_RESET_PHY_R
 void reset_phy(void)
 {

diff --git a/board/gen860t/gen860t.c b/board/gen860t/gen860t.c
index 008f765af89aa89466aa10f6f52835c462587cf9..b37a0f24d493458b8da346f4d7a6da9760d96d93 100644 (file)
--- a/board/gen860t/gen860t.c
+++ b/board/gen860t/gen860t.c
@@ -292,14 +292,3 @@ void board_poweroff (void)
        puts ("### Please power off the board ###\n");
        while (1);
 }
-
-#ifdef CONFIG_POST
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed (void)
-{
-       return 0;               /* No hotkeys supported */
-}
-#endif

diff --git a/board/korat/korat.c b/board/korat/korat.c
index f942052bd50f246deb53c23e46926a26b33b88f3..d5260dc232e4f9840ff606f1429fcd60df77bde3 100644 (file)
--- a/board/korat/korat.c
+++ b/board/korat/korat.c
@@ -622,17 +622,6 @@ void pci_target_init(struct pci_controller *hose)
 }
 #endif /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_TARGET_INIT) */
 
-#if defined(CONFIG_POST)
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-       return 0;       /* No hotkeys supported */
-}
-#endif /* CONFIG_POST */
-
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 void ft_board_setup(void *blob, bd_t *bd)
 {

diff --git a/board/kup/common/kup.c b/board/kup/common/kup.c
index fec5407bc742bf3f8edb4d38730b8e82556026b1..2418d59d866c6a0b945321eadd6da87671e9d76f 100644 (file)
--- a/board/kup/common/kup.c
+++ b/board/kup/common/kup.c
@@ -70,14 +70,3 @@ void poweron_key (void)
        else
                setenv ("key1", "on");
 }
-
-#ifdef CONFIG_POST
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed (void)
-{
-       return (0);
-}
-#endif

diff --git a/board/mpl/mip405/mip405.c b/board/mpl/mip405/mip405.c
index 495e9bd88a430f5f48c51156bfeb91f8c1c379d1..af3a98a42fb4255fd518b6fbd950d19ec2b0c2c0 100644 (file)
--- a/board/mpl/mip405/mip405.c
+++ b/board/mpl/mip405/mip405.c
@@ -706,17 +706,6 @@ void print_mip405_rev (void)
 }
 
 
-#ifdef CONFIG_POST
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-       return 0;       /* No hotkeys supported */
-}
-#endif
-
 extern int mk_date (char *, struct rtc_time *);
 
 int last_stage_init (void)

diff --git a/board/netstal/hcu4/hcu4.c b/board/netstal/hcu4/hcu4.c
index ba3e9c3cff1ef1adf6c9fd04146d99933ff381b1..8efbc23c897dadf32d4f26ba9611eee89114a8c8 100644 (file)
--- a/board/netstal/hcu4/hcu4.c
+++ b/board/netstal/hcu4/hcu4.c
@@ -174,17 +174,6 @@ phys_size_t initdram(int board_type)
        return dram_size;
 }
 
-#if defined(CONFIG_POST)
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-       return 0;       /* No hotkeys supported */
-}
-#endif /* CONFIG_POST */
-
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 void ft_board_setup(void *blob, bd_t *bd)
 {

diff --git a/board/netstal/hcu5/hcu5.c b/board/netstal/hcu5/hcu5.c
index 86156456441e771e85726dc3b42ced692a20ef5b..c545cc01ea760fb64a1a32dad41e32edc7e363b0 100644 (file)
--- a/board/netstal/hcu5/hcu5.c
+++ b/board/netstal/hcu5/hcu5.c
@@ -390,17 +390,6 @@ void pci_master_init(struct pci_controller *hose)
 }
 #endif  /* defined(CONFIG_PCI) */
 
-#if defined(CONFIG_POST)
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-       return 0;       /* No hotkeys supported */
-}
-#endif /* CONFIG_POST */
-
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 void ft_board_setup(void *blob, bd_t *bd)
 {

diff --git a/board/netstal/mcu25/mcu25.c b/board/netstal/mcu25/mcu25.c
index 945d79aa200e9b91fef805c1b220e4643dd97feb..c66ab97ac5b35b16e75797d925f428a00f589392 100644 (file)
--- a/board/netstal/mcu25/mcu25.c
+++ b/board/netstal/mcu25/mcu25.c
@@ -173,17 +173,6 @@ phys_size_t initdram(int board_type)
        return dram_size;
 }
 
-#if defined(CONFIG_POST)
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-       return 0;       /* No hotkeys supported */
-}
-#endif /* CONFIG_POST */
-
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 void ft_board_setup(void *blob, bd_t *bd)
 {

diff --git a/board/netta/netta.c b/board/netta/netta.c
index 38c9d8919e0cac6c9667dc8e27eddb066e183677..5c935f47a25c3d00ebb126ba1a24366c5fae3b0f 100644 (file)
--- a/board/netta/netta.c
+++ b/board/netta/netta.c
@@ -564,17 +564,6 @@ int pcmcia_init(void)
 
 #endif
 
-#ifdef CONFIG_POST
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-       return 0;       /* No hotkeys supported */
-}
-#endif
-
 #ifdef CONFIG_HW_WATCHDOG
 
 void hw_watchdog_reset(void)

diff --git a/board/prodrive/alpr/alpr.c b/board/prodrive/alpr/alpr.c
index 66153279fb64bdfad6d85ed3ce6303a610e1f780..060e7eb2372cc15c34ba6186e7033d01b45c1065 100644 (file)
--- a/board/prodrive/alpr/alpr.c
+++ b/board/prodrive/alpr/alpr.c
@@ -228,15 +228,3 @@ void pci_master_init(struct pci_controller *hose)
        out32r(PCIL0_POM1SA, ~(0x10000000 - 1) | 1);    /* 256MB + enable region */
 }
 #endif                         /* defined(CONFIG_PCI) && defined(CONFIG_SYS_PCI_MASTER_INIT) */
-
-#ifdef CONFIG_POST
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-
-       return (ctrlc());
-}
-#endif

diff --git a/board/sacsng/sacsng.c b/board/sacsng/sacsng.c
index 2513937ed126ee83ab590dce5a4df73372781f62..49d8bba15de0d10f9d874306d4bdc8e60b4cf413 100644 (file)
--- a/board/sacsng/sacsng.c
+++ b/board/sacsng/sacsng.c
@@ -869,15 +869,3 @@ void spi_cs_deactivate(struct spi_slave *slave)
 #endif
 
 #endif /* CONFIG_MISC_INIT_R */
-
-#ifdef CONFIG_POST
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-       return 0;       /* No hotkeys supported */
-}
-
-#endif

diff --git a/board/ssv/adnpesc1/adnpesc1.c b/board/ssv/adnpesc1/adnpesc1.c
index 72810d036aea9a73e89c9b4e07f5d2a2efcd5677..802bfba1ab685b8078198aa43cff285e830af4c8 100644 (file)
--- a/board/ssv/adnpesc1/adnpesc1.c
+++ b/board/ssv/adnpesc1/adnpesc1.c
@@ -91,17 +91,6 @@ void spi_cs_deactivate(struct spi_slave *slave)
 
 #endif
 
-#if    defined(CONFIG_POST)
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-       return 0;       /* No hotkeys supported */
-}
-#endif /* CONFIG_POST */
-
 #ifdef CONFIG_CMD_NET
 int board_eth_init(bd_t *bis)
 {

diff --git a/board/uc100/uc100.c b/board/uc100/uc100.c
index 38c7be6bad6d1b56a605c22ef50c1057531ea296..4dba2900dbcaaa31ee78e43dbac17a9d1208925d 100644 (file)
--- a/board/uc100/uc100.c
+++ b/board/uc100/uc100.c
@@ -268,15 +268,3 @@ int misc_init_r (void)
 
        return 0;
 }
-
-
-#ifdef CONFIG_POST
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed (void)
-{
-       return 0;               /* No hotkeys supported */
-}
-#endif

diff --git a/post/post.c b/post/post.c
index b74e7623169d562c3e69ece9c99790ff7302df7f..b29eb87fc2113701ca8c92618b62bdf568ee8e24 100644 (file)
--- a/post/post.c
+++ b/post/post.c
@@ -58,6 +58,22 @@ int post_init_f (void)
        return res;
 }
 
+/*
+ * Supply a default implementation for post_hotkeys_pressed() for boards
+ * without hotkey support. We always return 0 here, so that the
+ * long-running tests won't be started.
+ *
+ * Boards with hotkey support can override this weak default function
+ * by defining one in their board specific code.
+ */
+int __post_hotkeys_pressed(void)
+{
+       return 0;       /* No hotkeys supported */
+}
+int post_hotkeys_pressed(void)
+       __attribute__((weak, alias("__post_hotkeys_pressed")));
+
+
 void post_bootmode_init (void)
 {
        int bootmode = post_bootmode_get (0);