[Infineon] Rebase code rebase to avoid conflicts and fix github timeout change

Author: praveenCY

.github/workflows/examples-infineon.yaml

@@ -25,8 +25,8 @@ concurrency:
 
 jobs:
     infineon:
-        name: Infineon examples
-        timeout-minutes: 200
+        name: Infineon examples building
+        timeout-minutes: 140
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'

docs/guides/README.md

@@ -5,7 +5,7 @@
 -   [Android - Building](./android_building.md)
 -   [Apple - Testing with iPhone, iPad, macOS, Apple TV, HomePod, Watch, etc](./darwin.md)
 -   [Espressif (ESP32) - Getting Started Guide](./esp32/README.md)
--   [Infineon - Software Update](./infineon_p6_software_update.md)
+-   [Infineon PSoC6 - Software Update](./infineon_psoc6_software_update.md)
 -   [Linux - Simulated Devices](./simulated_device_linux.md)
 -   [mbedOS - Adding a new target](./mbedos_add_new_target.md)
 -   [mbedOS - Commissioning](./mbedos_commissioning.md)