diff --git a/[refs] b/[refs] index 6d74d33b77bc..5574ef6bb353 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee1ae4d7b1c9a8b73e232fa33dc733be59368ff6 +refs/heads/master: 626d90c884591005fdaa9464de81731aab23b864 diff --git a/trunk/arch/arm/mach-mx5/Makefile.boot b/trunk/arch/arm/mach-mx5/Makefile.boot index 9939a19d99a1..fec7cd921fcd 100644 --- a/trunk/arch/arm/mach-mx5/Makefile.boot +++ b/trunk/arch/arm/mach-mx5/Makefile.boot @@ -1,3 +1,3 @@ - zreladdr-y := 0x90008000 -params_phys-y := 0x90000100 -initrd_phys-y := 0x90800000 + zreladdr-$(CONFIG_ARCH_MX51) := 0x90008000 +params_phys-$(CONFIG_ARCH_MX51) := 0x90000100 +initrd_phys-$(CONFIG_ARCH_MX51) := 0x90800000