summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbigmagic <[email protected]>2020-01-10 14:14:37 +0800
committerbigmagic <[email protected]>2020-01-10 14:14:37 +0800
commitc8e4bca1fc2d7765b3ccb5b7cb95c8adc43e88d7 (patch)
tree80649fd4ccd3ef4aabb117268c20d26a9bf40514
parentfdde8ab1982adabc71ab651e55160993dbdd9365 (diff)
fix some bug
-rw-r--r--bsp/raspberry-pi/raspi3-32/driver/drv_fb.c3
-rw-r--r--bsp/raspberry-pi/raspi3-32/driver/drv_fb.h1
-rwxr-xr-xbsp/raspberry-pi/raspi3-64/kernel8.imgbin163872 -> 163920 bytes
-rw-r--r--bsp/raspberry-pi/raspi3-64/rtconfig.py3
4 files changed, 2 insertions, 5 deletions
diff --git a/bsp/raspberry-pi/raspi3-32/driver/drv_fb.c b/bsp/raspberry-pi/raspi3-32/driver/drv_fb.c
index a24ca63377..f15fa12fb4 100644
--- a/bsp/raspberry-pi/raspi3-32/driver/drv_fb.c
+++ b/bsp/raspberry-pi/raspi3-32/driver/drv_fb.c
@@ -429,7 +429,7 @@ void print_fb_info()
rt_kprintf("call mbox:%x,%x,%x,%x,%x\n", mbox[0], mbox[1], mbox[2], mbox[3], mbox[4]);
}
-void hdmi_fb_init()
+int hdmi_fb_init()
{
unsigned int *mbox = (unsigned int*) MBOX_ADDR;
mbox[0] = 35 * 4;
@@ -503,6 +503,7 @@ void hdmi_fb_init()
_hdmi_info.height = _hdmi.fb.height;
_hdmi_info.framebuffer = (rt_uint8_t *) _hdmi.fb.addr;
}
+ return 0;
}
INIT_DEVICE_EXPORT(hdmi_fb_init);
diff --git a/bsp/raspberry-pi/raspi3-32/driver/drv_fb.h b/bsp/raspberry-pi/raspi3-32/driver/drv_fb.h
index b11589e769..4926fa3ab1 100644
--- a/bsp/raspberry-pi/raspi3-32/driver/drv_fb.h
+++ b/bsp/raspberry-pi/raspi3-32/driver/drv_fb.h
@@ -55,6 +55,5 @@ struct rt_hdmi_fb_device
fb_t fb_info;
void print_fb_info();
-void hdmi_fb_init();
#endif/* __DRV_FB_H__ */
diff --git a/bsp/raspberry-pi/raspi3-64/kernel8.img b/bsp/raspberry-pi/raspi3-64/kernel8.img
index d1e9d50822..86b1df4fbc 100755
--- a/bsp/raspberry-pi/raspi3-64/kernel8.img
+++ b/bsp/raspberry-pi/raspi3-64/kernel8.img
Binary files differ
diff --git a/bsp/raspberry-pi/raspi3-64/rtconfig.py b/bsp/raspberry-pi/raspi3-64/rtconfig.py
index 54d5988b64..e376665083 100644
--- a/bsp/raspberry-pi/raspi3-64/rtconfig.py
+++ b/bsp/raspberry-pi/raspi3-64/rtconfig.py
@@ -16,9 +16,6 @@ if os.getenv('RTT_CC'):
PLATFORM = 'gcc'
EXEC_PATH = r'/opt/gcc-arm-8.3-2019.03-x86_64-aarch64-elf/bin/'
-if os.getenv('RTT_EXEC_PATH'):
- EXEC_PATH = os.getenv('RTT_EXEC_PATH')
-
BUILD = 'debug'
if PLATFORM == 'gcc':