imx8ulp: soc.c: use rom_api_query_boot_infor() wrapper
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>
Mon, 20 Jun 2022 08:53:22 +0000 (10:53 +0200)
committerStefano Babic <sbabic@denx.de>
Mon, 25 Jul 2022 13:35:34 +0000 (15:35 +0200)
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
arch/arm/mach-imx/imx8ulp/soc.c

index 35020c9..c0f0df3 100644 (file)
@@ -36,16 +36,13 @@ struct rom_api *g_rom_api = (struct rom_api *)0x1980;
 
 enum boot_device get_boot_device(void)
 {
-       volatile gd_t *pgd = gd;
        int ret;
        u32 boot;
        u16 boot_type;
        u8 boot_instance;
        enum boot_device boot_dev = SD1_BOOT;
 
-       ret = g_rom_api->query_boot_infor(QUERY_BT_DEV, &boot,
-                                         ((uintptr_t)&boot) ^ QUERY_BT_DEV);
-       set_gd(pgd);
+       ret = rom_api_query_boot_infor(QUERY_BT_DEV, &boot);
 
        if (ret != ROM_API_OKAY) {
                puts("ROMAPI: failure at query_boot_info\n");
@@ -91,15 +88,12 @@ __weak int board_mmc_get_env_dev(int devno)
 
 int mmc_get_env_dev(void)
 {
-       volatile gd_t *pgd = gd;
        int ret;
        u32 boot;
        u16 boot_type;
        u8 boot_instance;
 
-       ret = g_rom_api->query_boot_infor(QUERY_BT_DEV, &boot,
-                                         ((uintptr_t)&boot) ^ QUERY_BT_DEV);
-       set_gd(pgd);
+       ret = rom_api_query_boot_infor(QUERY_BT_DEV, &boot);
 
        if (ret != ROM_API_OKAY) {
                puts("ROMAPI: failure at query_boot_info\n");