Merge branch 'master' of git://git.denx.de/u-boot-atmel

[u-boot] / include / configs / paz00.h

diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index eac1ef9e0217098e8c0892111d770fedae0e1f87..284419ffc8a99a0694b105f0c73b3e663deb06a8 100644 (file)
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -17,14 +17,9 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include "tegra20-common.h"
 
-/* Enable fdt support for Paz00. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE     tegra20-paz00
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
-
 /* High-level configuration options */
 #define V_PROMPT               "Tegra20 (Paz00) MOD # "
 #define CONFIG_TEGRA_BOARD_STRING      "Compal Paz00"
@@ -35,9 +30,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_PAZ00
 
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT
-
 /* SD/MMC */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
@@ -46,7 +38,7 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_ENV_OFFSET ((1024 * 1024) - CONFIG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
 #define CONFIG_SYS_MMC_ENV_DEV 0
 #define CONFIG_SYS_MMC_ENV_PART 2