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>

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>
Stefan Roese · Wolfgang Denk
1 parent 2a49bf3149
Showing 22 changed files with 16 additions and 232 deletions Side-by-side Diff
board/amcc/katmai/katmai.c
board/amcc/kilauea/kilauea.c
board/amcc/makalu/makalu.c
board/amcc/ocotea/ocotea.c
board/amcc/sequoia/sequoia.c
board/amcc/taishan/taishan.c
board/amcc/yucca/yucca.c
board/cm5200/cm5200.c
board/esd/pmc440/pmc440.c
board/gen860t/gen860t.c
board/korat/korat.c
board/kup/common/kup.c
board/mpl/mip405/mip405.c
board/netstal/hcu4/hcu4.c
board/netstal/hcu5/hcu5.c
board/netstal/mcu25/mcu25.c
board/netta/netta.c
board/prodrive/alpr/alpr.c
board/sacsng/sacsng.c
board/ssv/adnpesc1/adnpesc1.c
@@ -279,17 +279,6 @@
 }
 #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);
@@ -284,15 +284,4 @@
  
 	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 */
@@ -236,15 +236,4 @@
  
 	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 */
@@ -400,16 +400,4 @@
  
 	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
@@ -370,17 +370,6 @@
 }
 #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
@@ -209,17 +209,6 @@
 	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);
@@ -708,17 +708,6 @@
 	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
  +---------------------------------------------------------------------------*/
@@ -330,14 +330,6 @@
 }
  
  
-#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)
 {
@@ -677,17 +677,6 @@
 }
 #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)
 {
@@ -292,15 +292,4 @@
 	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
@@ -622,17 +622,6 @@
 }
 #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)
 {
@@ -70,15 +70,4 @@
 	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
@@ -706,17 +706,6 @@
 }
  
  
-#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)
@@ -174,17 +174,6 @@
 	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)
 {
@@ -390,17 +390,6 @@
 }
 #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)
 {
@@ -173,17 +173,6 @@
 	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)
 {
@@ -564,17 +564,6 @@
  
 #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)
@@ -228,16 +228,4 @@
 	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
@@ -869,16 +869,4 @@
 #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
@@ -91,17 +91,6 @@
  
 #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)
 {
@@ -268,16 +268,4 @@
  
 	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
@@ -58,6 +58,22 @@
 	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);
...	...	@@ -279,17 +279,6 @@
279	279	}
280	280	#endif /* defined(CONFIG_PCI) */
281	281
282		-#ifdef CONFIG_POST
283		-/*
284		- * Returns 1 if keys pressed to start the power-on long-running tests
285		- * Called from board_init_f().
286		- */
287		-int post_hotkeys_pressed(void)
288		-{
289		- return (ctrlc());
290		-}
291		-#endif
292		-
293	282	int board_eth_init(bd_t *bis)
294	283	{
295	284	cpu_eth_init(bis);
...	...	@@ -284,15 +284,4 @@
284	284
285	285	return (0);
286	286	}
287		-
288		-#if defined(CONFIG_POST)
289		-/*
290		- * Returns 1 if keys pressed to start the power-on long-running tests
291		- * Called from board_init_f().
292		- */
293		-int post_hotkeys_pressed(void)
294		-{
295		- return 0; /* No hotkeys supported */
296		-}
297		-#endif /* CONFIG_POST */
...	...	@@ -236,15 +236,4 @@
236	236
237	237	return (0);
238	238	}
239		-
240		-#if defined(CONFIG_POST)
241		-/*
242		- * Returns 1 if keys pressed to start the power-on long-running tests
243		- * Called from board_init_f().
244		- */
245		-int post_hotkeys_pressed(void)
246		-{
247		- return 0; /* No hotkeys supported */
248		-}
249		-#endif /* CONFIG_POST */
...	...	@@ -400,16 +400,4 @@
400	400
401	401	return;
402	402	}
403		-
404		-#ifdef CONFIG_POST
405		-/*
406		- * Returns 1 if keys pressed to start the power-on long-running tests
407		- * Called from board_init_f().
408		- */
409		-int post_hotkeys_pressed(void)
410		-{
411		-
412		- return (ctrlc());
413		-}
414		-#endif
...	...	@@ -370,17 +370,6 @@
370	370	}
371	371	#endif
372	372
373		-#if defined(CONFIG_POST)
374		-/*
375		- * Returns 1 if keys pressed to start the power-on long-running tests
376		- * Called from board_init_f().
377		- */
378		-int post_hotkeys_pressed(void)
379		-{
380		- return 0; /* No hotkeys supported */
381		-}
382		-#endif /* CONFIG_POST */
383		-
384	373	#if defined(CONFIG_NAND_U_BOOT) \|\| defined(CONFIG_SYS_RAMBOOT)
385	374	/*
386	375	* On NAND-booting sequoia, we need to patch the chips select numbers
...	...	@@ -209,17 +209,6 @@
209	209	return (0);
210	210	}
211	211
212		-#ifdef CONFIG_POST
213		-/*
214		- * Returns 1 if keys pressed to start the power-on long-running tests
215		- * Called from board_init_f().
216		- */
217		-int post_hotkeys_pressed(void)
218		-{
219		- return (ctrlc());
220		-}
221		-#endif
222		-
223	212	int board_eth_init(bd_t *bis)
224	213	{
225	214	cpu_eth_init(bis);
...	...	@@ -708,17 +708,6 @@
708	708	return;
709	709	}
710	710
711		-#ifdef CONFIG_POST
712		-/*
713		- * Returns 1 if keys pressed to start the power-on long-running tests
714		- * Called from board_init_f().
715		- */
716		-int post_hotkeys_pressed(void)
717		-{
718		- return (ctrlc());
719		-}
720		-#endif
721		-
722	711	/*---------------------------------------------------------------------------+
723	712	\| onboard_pci_arbiter_selected => from EPLD
724	713	+---------------------------------------------------------------------------*/
...	...	@@ -330,14 +330,6 @@
330	330	}
331	331
332	332
333		-#ifdef CONFIG_POST
334		-int post_hotkeys_pressed(void)
335		-{
336		- return 0;
337		-}
338		-#endif /* CONFIG_POST */
339		-
340		-
341	333	#if defined(CONFIG_POST) \|\| defined(CONFIG_LOGBUFFER)
342	334	void post_word_store(ulong a)
343	335	{
...	...	@@ -677,17 +677,6 @@
677	677	}
678	678	#endif /* defined(CONFIG_PCI) */
679	679
680		-#if defined(CONFIG_POST)
681		-/*
682		- * Returns 1 if keys pressed to start the power-on long-running tests
683		- * Called from board_init_f().
684		- */
685		-int post_hotkeys_pressed(void)
686		-{
687		- return 0; /* No hotkeys supported */
688		-}
689		-#endif /* CONFIG_POST */
690		-
691	680	#ifdef CONFIG_RESET_PHY_R
692	681	void reset_phy(void)
693	682	{
...	...	@@ -292,15 +292,4 @@
292	292	puts ("### Please power off the board ###\n");
293	293	while (1);
294	294	}
295		-
296		-#ifdef CONFIG_POST
297		-/*
298		- * Returns 1 if keys pressed to start the power-on long-running tests
299		- * Called from board_init_f().
300		- */
301		-int post_hotkeys_pressed (void)
302		-{
303		- return 0; /* No hotkeys supported */
304		-}
305		-#endif