mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
board: MCR3000: use new DM watchdog
This patch switches MCR3000 board to the new DM watchdog. The change in u-boot.lds is because MCR3000.o grows a bit with this patch and doesn't fit anymore below env_offset on some versions of GCC. Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
This commit is contained in:
parent
749c9aae9d
commit
4c4ca6cdd5
|
@ -9,4 +9,7 @@
|
||||||
/dts-v1/;
|
/dts-v1/;
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
|
WDT: watchdog@0 {
|
||||||
|
compatible = "fsl,pq1-wdt";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -12,6 +12,8 @@
|
||||||
#include <mpc8xx.h>
|
#include <mpc8xx.h>
|
||||||
#include <fdt_support.h>
|
#include <fdt_support.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
#include <dm/uclass.h>
|
||||||
|
#include <wdt.h>
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
|
@ -143,3 +145,17 @@ int board_early_init_f(void)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int board_early_init_r(void)
|
||||||
|
{
|
||||||
|
struct udevice *watchdog_dev = NULL;
|
||||||
|
|
||||||
|
if (uclass_get_device(UCLASS_WDT, 0, &watchdog_dev)) {
|
||||||
|
puts("Cannot find watchdog!\n");
|
||||||
|
} else {
|
||||||
|
puts("Enabling watchdog.\n");
|
||||||
|
wdt_start(watchdog_dev, 0xffff, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
|
@ -19,7 +19,6 @@ SECTIONS
|
||||||
arch/powerpc/cpu/mpc8xx/start.o (.text)
|
arch/powerpc/cpu/mpc8xx/start.o (.text)
|
||||||
arch/powerpc/cpu/mpc8xx/traps.o (.text*)
|
arch/powerpc/cpu/mpc8xx/traps.o (.text*)
|
||||||
arch/powerpc/lib/built-in.o (.text*)
|
arch/powerpc/lib/built-in.o (.text*)
|
||||||
board/cssi/MCR3000/built-in.o (.text*)
|
|
||||||
drivers/net/built-in.o (.text*)
|
drivers/net/built-in.o (.text*)
|
||||||
|
|
||||||
. = DEFINED(env_offset) ? env_offset : .;
|
. = DEFINED(env_offset) ? env_offset : .;
|
||||||
|
|
|
@ -42,6 +42,7 @@ CONFIG_BOOTDELAY=5
|
||||||
CONFIG_USE_BOOTCOMMAND=y
|
CONFIG_USE_BOOTCOMMAND=y
|
||||||
CONFIG_BOOTCOMMAND="run flashboot"
|
CONFIG_BOOTCOMMAND="run flashboot"
|
||||||
CONFIG_MISC_INIT_R=y
|
CONFIG_MISC_INIT_R=y
|
||||||
|
CONFIG_BOARD_EARLY_INIT_R=y
|
||||||
CONFIG_HUSH_PARSER=y
|
CONFIG_HUSH_PARSER=y
|
||||||
# CONFIG_AUTO_COMPLETE is not set
|
# CONFIG_AUTO_COMPLETE is not set
|
||||||
CONFIG_SYS_PROMPT="S3K> "
|
CONFIG_SYS_PROMPT="S3K> "
|
||||||
|
@ -76,3 +77,5 @@ CONFIG_OF_LIBFDT=y
|
||||||
CONFIG_DM=y
|
CONFIG_DM=y
|
||||||
CONFIG_OF_CONTROL=y
|
CONFIG_OF_CONTROL=y
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="mcr3000"
|
CONFIG_DEFAULT_DEVICE_TREE="mcr3000"
|
||||||
|
CONFIG_WDT=y
|
||||||
|
CONFIG_WDT_MPC8xx=y
|
||||||
|
|
Loading…
Reference in New Issue
Block a user