Comments (3)
anotherbob67
commented on August 12, 2024
'''' *** Relaunching after update
*** Raspberry Pi firmware updater by Hexxeh, enhanced by AndrewS
*** ARM/GPU split is now defined in /boot/config.txt using the gpu_mem option!
*** Updating firmware (this may take a few minutes)
remote: Counting objects: 2384, done.
remote: Compressing objects: 100% (1441/1441), done.
remote: Total 2384 (delta 825), reused 2156 (delta 714)
Receiving objects: 100% (2384/2384), 70.86 MiB | 897 KiB/s, done.
Resolving deltas: 100% (825/825), done.
From http://github.com/Hexxeh/rpi-firmware
- 3851111...3211579 master -> origin/master (forced update)
- [new branch] next -> origin/next
HEAD is now at 3851111 Rebuild with sdcard retry mechanism from derolf.
Removing --h.tar.gz
warning: Cannot merge binary files: vc/softfp/opt/vc/sbin/vcfiled (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/lib/libvmcs_rpc_client.a (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/lib/libvcos.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/lib/libvchostif.a (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/lib/libvchiq_arm.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/lib/libvcfiled_check.a (HEAD vs. origin/master)
warning: Cannot merge binary files: v /softfp/opt/vc/lib/libopenmaxil.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/lib/libmmal_vc_client.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/lib/libmmal.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/lib/libkhrn_static.a (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/lib/libkhrn_client.a (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/lib/libdebug_sym.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/lib/libbcm_host.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/lib/libWFC.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/lib/libGLESv2_static.a (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/lib/libGLESv2.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/lib/libGLESv1_CM.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/lib/libEGL_static.a (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/lib/libEGL.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/bin/vchiq_test (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/bin/vcgencmd (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/bin/vcdbg (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/bin/tvservice (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/softfp/opt/vc/bin/edidparser (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/sbin/vcfiled (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/lib/libvmcs_rpc_client.a (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/lib/libvcos.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/lib/libvchostif.a (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/lib/libvchiq_arm.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/lib/libvcfiled_check.a (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/lib/libopenmaxil.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/lib/libmmal_vc_client.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/lib/libmmal.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/lib/libkhrn_static.a (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/lib/libkhrn_client.a (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/lib/libdebug_sym.so (HEAD vs. origin/master)
warning: Cannot merge binary files: v /hardfp/opt/vc/lib/libbcm_host.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/lib/libWFC.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/lib/libGLESv2_static.a (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/lib/libGLESv2.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/lib/libGLESv1_CM.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/lib/libEGL_static.a (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/lib/libEGL.so (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/bin/vchiq_test (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/bin/vcgencmd (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/bin/vcdbg (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/bin/tvservice (HEAD vs. origin/master)
warning: Cannot merge binary files: vc/hardfp/opt/vc/bin/edidparser (HEAD vs. origin/master)
warning: Cannot merge binary files: start_cd.elf (HEAD vs. origin/master)
warning: Cannot merge binary files: start.elf (HEAD vs. origin/master)
warning: Cannot merge binary files: kernel_emergency.img (HEAD vs. origin/master)
warning: Cannot merge binary files: kernel.img (HEAD vs. origin/master)
warning: Cannot merge binary files: fixup_cd.dat (HEAD vs. origin/master)
warning: Cannot merge binary files: fixup.dat (HEAD vs. origin/master)
warning: Cannot merge binary files: bootcode.bin (HEAD vs. origin/master)
Auto-merging vc/softfp/opt/vc/sbin/vcfiled
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/sbin/vcfiled
Auto-merging vc/softfp/opt/vc/lib/libvmcs_rpc_client.a
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/lib/libvmcs_rpc_client.a
Auto-merging vc/softfp/opt/vc/lib/libvcos.so
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/lib/libvcos.so
Auto-merging vc/softfp/opt/vc/lib/libvchostif.a
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/lib/libvchostif.a
Auto-merging vc/softfp/opt/vc/lib/libvchiq_arm.so
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/lib/libvchiq_arm.so
Auto-merging vc/softfp/opt/vc/lib/libvcfiled_check.a
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/lib/libvcfiled_check.a
Auto-merging vc/softfp/opt/vc/lib/libopenmaxil.so
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/lib/libopenmaxil.so
Auto-merging vc/softfp/opt/vc/lib/libmmal_vc_client.so
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/lib/libmmal_vc_client.so
Auto-merging vc/softfp/opt/vc/lib/libmmal.so
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/lib/libmmal.so
Auto-merging vc/softfp/opt/vc/lib/libkhrn_static.a
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/lib/libkhrn_static.a
Auto-merging vc/softfp/opt/vc/lib/libkhrn_client.a
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/lib/libkhrn_client.a
Auto-merging vc/softfp/opt/vc/lib/libdebug_sym.so
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/lib/libdebug_sym.so
Auto-merging vc/softfp/opt/vc/lib/libbcm_host.so
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/lib/libbcm_host.so
Auto-merging vc/softfp/opt/vc/lib/libWFC.so
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/lib/libWFC.so
Auto-merging vc/softfp/opt/vc/lib/libGLESv2_static.a
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/lib/libGLESv2_static.a
Auto-merging vc/softfp/opt/vc/lib/libGLESv2.so
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/lib/libGLESv2.so
Auto-merging vc/softfp/opt/vc/lib/libGLESv1_CM.so
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/lib/libGLESv1_CM.so
Auto-merging vc/softfp/opt/vc/lib/libEGL_static.a
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/lib/libEGL_static.a
Auto-merging vc/softfp/opt/vc/lib/libEGL.so
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/lib/libEGL.so
Auto-merging vc/softfp/opt/vc/bin/vchiq_test
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/bin/vchiq_test
Auto-merging vc/softfp/opt/vc/bin/vcgencmd
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/bin/vcgencmd
Auto-merging vc/softfp/opt/vc/bin/vcdbg
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/bin/vcdbg
Auto-merging vc/softfp/opt/vc/bin/tvservice
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/bin/tvservice
Auto-merging vc/softfp/opt/vc/bin/edidparser
CONFLICT (add/add): Merge conflict in vc/softfp/opt/vc/bin/edidparser
Auto-merging vc/sdk/opt/vc/include/vcinclude/vcore.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/vcinclude/vcore.h
Auto-merging vc/sdk/opt/vc/include/vcinclude/common.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/vcinclude/common.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/vcilcs_common.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/vcilcs_common.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/vcilcs.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/vcilcs.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/vcgencmd.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/vcgencmd.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/vcfilesys_defs.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/vcfilesys_defs.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/vc_vchi_audioserv_defs.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/vc_vchi_audioserv_defs.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/vc_tvservice_defs.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/vc_tvservice_defs.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/vc_tvservice.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/vc_tvservice.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/vc_sdtv.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/vc_sdtv.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/vc_ilcs_defs.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/vc_ilcs_defs.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/vc_hostreq_defs.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/vc_hostreq_defs.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/vc_hdmi_property.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/vc_hdmi_property.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/vc_hdmi.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/vc_hdmi.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/vc_fileservice_defs.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/vc_fileservice_defs.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/vc_dispservice_x_defs.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/vc_dispservice_x_defs.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/vc_dispmanx_types.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/vc_dispmanx_types.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/vc_dispmanx.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/vc_dispmanx.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/vc_cecservice.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/vc_cecservice.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Video.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Video.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Index.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Index.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Image.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Image.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_IVCommon.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_IVCommon.h
Auto-merging vc/sdk/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Broadcom.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Broadcom.h
Auto-merging vc/sdk/opt/vc/include/interface/vctypes/vc_image_types.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vctypes/vc_image_types.h
Auto-merging vc/sdk/opt/vc/include/interface/vctypes/vc_display_types.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vctypes/vc_display_types.h
Auto-merging vc/sdk/opt/vc/include/interface/vcos/vcos_types.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vcos/vcos_types.h
Auto-merging vc/sdk/opt/vc/include/interface/vcos/vcos_tls.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vcos/vcos_tls.h
Auto-merging vc/sdk/opt/vc/include/interface/vcos/vcos_reentrant_mutex.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vcos/vcos_reentrant_mutex.h
Auto-merging vc/sdk/opt/vc/include/interface/vcos/vcos_quickslow_mutex.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vcos/vcos_quickslow_mutex.h
Auto-merging vc/sdk/opt/vc/include/interface/vcos/vcos_queue.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vcos/vcos_queue.h
Auto-merging vc/sdk/opt/vc/include/interface/vcos/vcos_named_semaphore.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vcos/vcos_named_semaphore.h
Auto-merging vc/sdk/opt/vc/include/interface/vcos/vcos_mempool.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vcos/vcos_mempool.h
Auto-merging vc/sdk/opt/vc/include/interface/vcos/vcos_legacy_isr.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vcos/vcos_legacy_isr.h
Auto-merging vc/sdk/opt/vc/include/interface/vcos/vcos_isr.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vcos/vcos_isr.h
Auto-merging vc/sdk/opt/vc/include/interface/vcos/vcos_blockpool.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vcos/vcos_blockpool.h
Auto-merging vc/sdk/opt/vc/include/interface/vcos/vcos_assert.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vcos/vcos_assert.h
Auto-merging vc/sdk/opt/vc/include/interface/vcos/pthreads/vcos_platform_types.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vcos/pthreads/vcos_platform_types.h
Auto-merging vc/sdk/opt/vc/include/interface/vcos/pthreads/vcos_platform.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vcos/pthreads/vcos_platform.h
Auto-merging vc/sdk/opt/vc/include/interface/vcos/pthreads/vcos_futex_mutex.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vcos/pthreads/vcos_futex_mutex.h
Auto-merging vc/sdk/opt/vc/include/interface/vchiq_arm/vchiq_util.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vchiq_arm/vchiq_util.h
Auto-merging vc/sdk/opt/vc/include/interface/vchiq_arm/vchiq_test.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vchiq_arm/vchiq_test.h
Auto-merging vc/sdk/opt/vc/include/interface/vchiq_arm/vchiq_ioctl.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vchiq_arm/vchiq_ioctl.h
Auto-merging vc/sdk/opt/vc/include/interface/vchiq_arm/vchiq_if.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vchiq_arm/vchiq_if.h
Auto-merging vc/sdk/opt/vc/include/interface/vchiq_arm/vchiq_cfg.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vchiq_arm/vchiq_cfg.h
Auto-merging vc/sdk/opt/vc/include/interface/vchi/vchi_common.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vchi/vchi_common.h
Auto-merging vc/sdk/opt/vc/include/interface/vchi/vchi_cfg_internal.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vchi/vchi_cfg_internal.h
Auto-merging vc/sdk/opt/vc/include/interface/vchi/vchi_cfg.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vchi/vchi_cfg.h
Auto-merging vc/sdk/opt/vc/include/interface/vchi/vchi.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vchi/vchi.h
Auto-merging vc/sdk/opt/vc/include/interface/vchi/message_drivers/message.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vchi/message_drivers/message.h
Auto-merging vc/sdk/opt/vc/include/interface/vchi/connections/connection.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/interface/vchi/connections/connection.h
Auto-merging vc/sdk/opt/vc/include/IL/OMX_Video.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/IL/OMX_Video.h
Auto-merging vc/sdk/opt/vc/include/IL/OMX_Index.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/IL/OMX_Index.h
Auto-merging vc/sdk/opt/vc/include/IL/OMX_Image.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/IL/OMX_Image.h
Auto-merging vc/sdk/opt/vc/include/IL/OMX_IVCommon.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/IL/OMX_IVCommon.h
Auto-merging vc/sdk/opt/vc/include/IL/OMX_Broadcom.h
CONFLICT (add/add): Merge conflict in vc/sdk/opt/vc/include/IL/OMX_Broadcom.h
Auto-merging vc/hardfp/opt/vc/sbin/vcfiled
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/sbin/vcfiled
Auto-merging vc/hardfp/opt/vc/lib/libvmcs_rpc_client.a
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/lib/libvmcs_rpc_client.a
Auto-merging vc/hardfp/opt/vc/lib/libvcos.so
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/lib/libvcos.so
Auto-merging vc/hardfp/opt/vc/lib/libvchostif.a
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/lib/libvchostif.a
Auto-merging vc/hardfp/opt/vc/lib/libvchiq_arm.so
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/lib/libvchiq_arm.so
Auto-merging vc/hardfp/opt/vc/lib/libvcfiled_check.a
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/lib/libvcfiled_check.a
Auto-merging vc/hardfp/opt/vc/lib/libopenmaxil.so
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/lib/libopenmaxil.so
Auto-merging vc/hardfp/opt/vc/lib/libmmal_vc_client.so
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/lib/libmmal_vc_client.so
Auto-merging vc/hardfp/opt/vc/lib/libmmal.so
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/lib/libmmal.so
Auto-merging vc/hardfp/opt/vc/lib/libkhrn_static.a
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/lib/libkhrn_static.a
Auto-merging vc/hardfp/opt/vc/lib/libkhrn_client.a
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/lib/libkhrn_client.a
Auto-merging vc/hardfp/opt/vc/lib/libdebug_sym.so
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/lib/libdebug_sym.so
Auto-merging vc/hardfp/opt/vc/lib/libbcm_host.so
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/lib/libbcm_host.so
Auto-merging vc/hardfp/opt/vc/lib/libWFC.so
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/lib/libWFC.so
Auto-merging vc/hardfp/opt/vc/lib/libGLESv2_static.a
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/lib/libGLESv2_static.a
Auto-merging vc/hardfp/opt/vc/lib/libGLESv2.so
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/lib/libGLESv2.so
Auto-merging vc/hardfp/opt/vc/lib/libGLESv1_CM.so
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/lib/libGLESv1_CM.so
Auto-merging vc/hardfp/opt/vc/lib/libEGL_static.a
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/lib/libEGL_static.a
Auto-merging vc/hardfp/opt/vc/lib/libEGL.so
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/lib/libEGL.so
Auto-merging vc/hardfp/opt/vc/bin/vchiq_test
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/bin/vchiq_test
Auto-merging vc/hardfp/opt/vc/bin/vcgencmd
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/bin/vcgencmd
Auto-merging vc/hardfp/opt/vc/bin/vcdbg
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/bin/vcdbg
Auto-merging vc/hardfp/opt/vc/bin/tvservice
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/bin/tvservice
Auto-merging vc/hardfp/opt/vc/bin/edidparser
CONFLICT (add/add): Merge conflict in vc/hardfp/opt/vc/bin/edidparser
Auto-merging start_cd.elf
CONFLICT (add/add): Merge conflict in start_cd.elf
Auto-merging start.elf
CONFLICT (add/add): Merge conflict in start.elf
Auto-merging kernel_emergency.img
CONFLICT (add/add): Merge conflict in kernel_emergency.img
Auto-merging kernel.img
CONFLICT (add/add): Merge conflict in kernel.img
Auto-merging fixup_cd.dat
CONFLICT (add/add): Merge conflict in fixup_cd.dat
Auto-merging fixup.dat
CONFLICT (add/add): Merge conflict in fixup.dat
Auto-merging bootcode.bin
CONFLICT (add/add): Merge conflict in bootcode.bin
Automatic merge failed; fix conflicts and then commit the result. ''''
from rpi-update.
barbaros
commented on August 12, 2024
I just had this problem also, is there a solution for this?
from rpi-update.
licaon-kter
commented on August 12, 2024
sudo rm -rf /root/.rpi-firmware and sudo rpi-update ?
from rpi-update.
Related Issues (20)
- Invalid hash given HOT 8
- /boot/kernel7l.img needs to exist to get a V8 kernel installed HOT 5
- PRUNE_MODULES=1 does not seem to do anything HOT 13
- Firmware not activated - ubuntu HOT 2
- log file somewhere? HOT 7
- ssl error when runnung rpi-update on rpi3 HOT 6
- rpi-update on rpi4/8G results in soft FP libs installed HOT 4
- proxy support
- pi@raspberrypi:~ $ sudo rpi-update *** Github API is currently rate limited - please try again after HOT 3
- Boot fails in encrypted sdcard after running `rpi-update` HOT 5
- HDMI output hasn't worked since 78c1429cc1d5a200d824d2629c3ceba4ba4617fe HOT 9
- mismatch of "uname -m" output and "getconf LONG_BIT" HOT 3
- problem running SKIP_DOWNLOAD=1 rpi-update cannot stat '//root/.rpi-firmware/*.elf' issue HOT 9
- OpenCL support HOT 1
- PRUNE_MODULES only runs if there is an update HOT 3
- How would you upgrade/downgrade/restore the current stable "default" firmware? HOT 2
- t HOT 1
- Input output error HOT 2
- How to install new firmware from code (Uninterrupted by -y) ? HOT 2
- Latest firmware update showing 64bit on 32bit OS (armv7l vs aarch64) HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from rpi-update.