X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=board%2Fkaro%2Fcommon%2Fkaro.h;h=d4f5cdb9e8821d3cb46c2979296f32bc5ade9c73;hp=f2a9f92e903c708a7a7fdf914e6ad1d2e27653db;hb=18291c7ea879bae3af53a65eac4e5c81e53ad662;hpb=1cf4ee5eb43e01d5d7e5464f3f7eade3f9ecd680

diff --git a/board/karo/common/karo.h b/board/karo/common/karo.h
index f2a9f92e90..d4f5cdb9e8 100644
--- a/board/karo/common/karo.h
+++ b/board/karo/common/karo.h
@@ -14,6 +14,9 @@
  * GNU General Public License for more details.
  *
 */
+
+#include <errno.h>
+
 struct fb_videomode;
 
 #ifdef CONFIG_SYS_LVDS_IF
@@ -22,14 +25,17 @@ struct fb_videomode;
 #define is_lvds()			0
 #endif
 
+void env_cleanup(void);
+
 #ifdef CONFIG_OF_LIBFDT
 void karo_fdt_remove_node(void *blob, const char *node);
 void karo_fdt_move_fdt(void);
 void karo_fdt_fixup_touchpanel(void *blob, const char *panels[],
 			size_t num_panels);
-void karo_fdt_fixup_usb_otg(void *blob, const char *node, const char *phy);
+void karo_fdt_fixup_usb_otg(void *blob, const char *node, const char *phy,
+			const char *phy_supply);
 void karo_fdt_fixup_flexcan(void *blob, int xcvr_present);
-void karo_fdt_del_prop(void *blob, const char *compat, phys_addr_t offs,
+void karo_fdt_del_prop(void *blob, const char *compat, u32 offs,
 		const char *prop);
 void karo_fdt_enable_node(void *blob, const char *node, int enable);
 int karo_fdt_get_fb_mode(void *blob, const char *name,
@@ -50,14 +56,15 @@ static inline void karo_fdt_fixup_touchpanel(void *blob, const char *panels[],
 {
 }
 static inline void karo_fdt_fixup_usb_otg(void *blob, const char *node,
-					const char *phy)
+					const char *phy,
+					const char *phy_supply)
 {
 }
 static inline void karo_fdt_fixup_flexcan(void *blob, int xcvr_present)
 {
 }
 static inline void karo_fdt_del_prop(void *blob, const char *compat,
-				phys_addr_t offs, const char *prop)
+				u32 offs, const char *prop)
 {
 }
 static inline void karo_fdt_enable_node(void *blob, const char *node,
@@ -133,7 +140,7 @@ static inline int karo_load_nand_part(const char *part, void *addr, size_t len)
 }
 #endif
 
-#ifdef CONFIG_CMD_MMC
+#ifdef CONFIG_ENV_IS_IN_MMC
 int karo_load_mmc_part(const char *part, void *addr, size_t len);
 #else
 static inline int karo_load_mmc_part(const char *part, void *addr, size_t len)
@@ -151,3 +158,5 @@ static inline int karo_load_part(const char *part, void *addr, size_t len)
 		return karo_load_mmc_part(part, addr, len);
 	return ret;
 }
+
+#define DIV_ROUND(n, d)		(((n) + (d) / 2) / (d))