X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cpu%2Fnios2%2Fcpu.c;h=6379534a0b5c59175332a11b317fbd5f35fec39d;hb=156feb90d200f186cdfd856d7f6f1878bb1bec1e;hp=f4217a88cf16652ed687e707f78c920170def312;hpb=0c1c117cf18ffa3fdc0342dfc47c6003fc5fc5a0;p=oweals%2Fu-boot.git

diff --git a/cpu/nios2/cpu.c b/cpu/nios2/cpu.c
index f4217a88cf..6379534a0b 100644
--- a/cpu/nios2/cpu.c
+++ b/cpu/nios2/cpu.c
@@ -25,14 +25,14 @@
 #include <nios2.h>
 #include <nios2-io.h>
 
-#if defined (CFG_NIOS_SYSID_BASE)
+#if defined (CONFIG_SYS_NIOS_SYSID_BASE)
 extern void display_sysid (void);
-#endif /* CFG_NIOS_SYSID_BASE */
+#endif /* CONFIG_SYS_NIOS_SYSID_BASE */
 
 int checkcpu (void)
 {
 	printf ("CPU   : Nios-II\n");
-#if !defined(CFG_NIOS_SYSID_BASE)
+#if !defined(CONFIG_SYS_NIOS_SYSID_BASE)
 	printf ("SYSID : <unknown>\n");
 #else
 	display_sysid ();
@@ -43,7 +43,7 @@ int checkcpu (void)
 
 int do_reset (void)
 {
-	void (*rst)(void) = (void(*)(void))CFG_RESET_ADDR;
+	void (*rst)(void) = (void(*)(void))CONFIG_SYS_RESET_ADDR;
 	disable_interrupts ();
 	rst();
 	return(0);